change to copy whole directories instead of individual files

2026-08-21 16:40:28 -05:00
parent 4665903b01
commit 6cdfecfd8d
1 changed files with 108 additions and 74 deletions
@@ -66,79 +66,101 @@

 #### Configure sshd

-    - name: Make sure /etc/ssh/sshd_config.d exists
-      become: true
-      ansible.builtin.file:
-        path: /etc/ssh/sshd_config.d
-        state: directory
-        owner: root
-        group: root
-        mode: u=rwx,go=rx
+#   - name: Make sure /etc/ssh/sshd_config.d exists
+#     become: true
+#     ansible.builtin.file:
+#       path: /etc/ssh/sshd_config.d
+#       state: directory
+#       owner: root
+#       group: root
+#       mode: u=rwx,go=rx
+#
+#   - name: Get /etc/ssh/sshd_config.d/hpf.conf
+#     become: true
+#     ansible.builtin.copy:
+#       src: etc/ssh/sshd_config.d/hpf.conf
+#       dest: /etc/ssh/sshd_config.d/hpf.conf
+#       owner: root
+#       group: root
+#       mode: u=rwx,go=rx
+#       backup: true
+#       validate: /usr/sbin/sshd -t -f %s
+#     notify: Restart sshd

-    - name: Get /etc/ssh/sshd_config.d/hpf.conf
+    - name: Get /etc/ssh/sshd_config.d
      become: true
      ansible.builtin.copy:
-        src: etc/ssh/sshd_config.d/hpf.conf
-        dest: /etc/ssh/sshd_config.d/hpf.conf
+        src: etc/ssh/sshd_config.d/
+        dest: /etc/ssh/
        owner: root
        group: root
-        mode: u=rwx,go=rx
+        directory_mode: u=rwx,go=rx
+        mode: u=rw,go=r
        backup: true
        validate: /usr/sbin/sshd -t -f %s
      notify: Restart sshd

-
 #### Configure /etc/skel

-    - name: Make sure /etc/skel/.profile.d exists
-      become: true
-      ansible.builtin.file:
-        path: /etc/skel/.profile.d
-        state: directory
-        owner: root
-        group: root
-        mode: u=rwx,go=
+    # - name: Make sure /etc/skel/.profile.d exists
+    #   become: true
+    #   ansible.builtin.file:
+    #     path: /etc/skel/.profile.d
+    #     state: directory
+    #     owner: root
+    #     group: root
+    #     mode: u=rwx,go=

-    - name: Get /etc/skel/.profile.d/ansible-venv.sh
+    # - name: Get /etc/skel/.profile.d/ansible-venv.sh
+    #   become: true
+    #   ansible.builtin.copy:
+    #     src: etc/skel/.profile.d/ansible-venv.sh
+    #     dest: /etc/skel/.profile.d/ansible-venv.sh
+    #     owner: root
+    #     group: root
+    #     mode: u=rw,go=
+    #     backup: true
+
+    # - name: Get /etc/skel/.profile
+    #   become: true
+    #   ansible.builtin.copy:
+    #     src: etc/skel/.profile
+    #     dest: /etc/skel/.profile
+    #     owner: root
+    #     group: root
+    #     mode: u=rw,go=
+    #     backup: true
+
+    # - name: Make sure /etc/skel/.bashrc.d exists
+    #   become: true
+    #   ansible.builtin.file:
+    #     path: /etc/skel/.bashrc.d
+    #     state: directory
+    #     owner: root
+    #     group: root
+    #     mode: u=rwx,go=
+
+    # - name: Get /etc/skel/.bashrc
+    #   become: true
+    #   ansible.builtin.copy:
+    #     src: etc/skel/.bashrc
+    #     dest: /etc/skel/.bashrc
+    #     owner: root
+    #     group: root
+    #     mode: u=rw,go=
+    #     backup: true
+
+    - name: Get /etc/skel
      become: true
      ansible.builtin.copy:
-        src: etc/skel/.profile.d/ansible-venv.sh
-        dest: /etc/skel/.profile.d/ansible-venv.sh
+        src: etc/skel/
+        dest: /etc/
        owner: root
        group: root
+        directory_mode: u=rwx,go=rx
        mode: u=rw,go=
        backup: true

-    - name: Get /etc/skel/.profile
-      become: true
-      ansible.builtin.copy:
-        src: etc/skel/.profile
-        dest: /etc/skel/.profile
-        owner: root
-        group: root
-        mode: u=rw,go=
-        backup: true
-
-    - name: Make sure /etc/skel/.bashrc.d exists
-      become: true
-      ansible.builtin.file:
-        path: /etc/skel/.bashrc.d
-        state: directory
-        owner: root
-        group: root
-        mode: u=rwx,go=
-
-    - name: Get /etc/skel/.bashrc
-      become: true
-      ansible.builtin.copy:
-        src: etc/skel/.bashrc
-        dest: /etc/skel/.bashrc
-        owner: root
-        group: root
-        mode: u=rw,go=
-        backup: true
-
-
 #### User: root

    - name: Set root's authorized_keys
@@ -206,6 +228,18 @@
        shell: /usr/bin/bash
        password_lock: true

+    - name: Get /home/hpf-ans/bin
+      become: true
+      become_user: hpf-ans
+      ansible.builtin.copy:
+        src: home/hpf-ans/bin/
+        dest: $HOME/
+        owner: hpf-ans
+        group: hpf-ans
+        directory_mode: u=rwx,go=
+        mode: u=rwx,go=
+        backup: true
+
    - name: Set hpf-ans's authorized_keys
      become: true
      ansible.posix.authorized_key:
@@ -269,26 +303,26 @@

 #### ansible-pull.sh

-    - name: Make sure /home/hpf-ans/bin exists
-      become: true
-      become_user: hpf-ans
-      ansible.builtin.file:
-        path: $HOME/bin
-        state: directory
-        owner: hpf-ans
-        group: hpf-ans
-        mode: u=rwx,go=
+    # - name: Make sure /home/hpf-ans/bin exists
+    #   become: true
+    #   become_user: hpf-ans
+    #   ansible.builtin.file:
+    #     path: $HOME/bin
+    #     state: directory
+    #     owner: hpf-ans
+    #     group: hpf-ans
+    #     mode: u=rwx,go=

-    - name: Get /home/hpf-ans/bin/ansible-pull.sh
-      become: true
-      become_user: hpf-ans
-      ansible.builtin.copy:
-        src: home/hpf-ans/bin/ansible-pull.sh
-        dest: $HOME/bin/ansible-pull.sh
-        owner: hpf-ans
-        group: hpf-ans
-        mode: u=rwx,go=
-        backup: true
+    # - name: Get /home/hpf-ans/bin/ansible-pull.sh
+    #   become: true
+    #   become_user: hpf-ans
+    #   ansible.builtin.copy:
+    #     src: home/hpf-ans/bin/ansible-pull.sh
+    #     dest: $HOME/bin/ansible-pull.sh
+    #     owner: hpf-ans
+    #     group: hpf-ans
+    #     mode: u=rwx,go=
+    #     backup: true

    - name: Make sure log directory exists
      become: true
@@ -297,7 +331,7 @@
        state: directory
        owner: hpf-ans
        group: root
-        mode: u=rwx,go=
+        mode: u=rwx,g=r,o=

 #    - name: Create ansible-pull.sh crontab entry
 #      become: true