diff --git a/group_vars/all/nameserver.yml b/group_vars/all/nameserver.yml new file mode 100644 index 0000000..a213d8d --- /dev/null +++ b/group_vars/all/nameserver.yml @@ -0,0 +1,5 @@ +--- + +nameserver: + google: 8.8.8.8 + cloudflare: 1.1.1.1 diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml new file mode 100644 index 0000000..8d81d15 --- /dev/null +++ b/group_vars/all/users.yml @@ -0,0 +1,19 @@ +users: + - name: root + uid: 0 + gid: 0 + groups: sudo + shell: /bin/bash + password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0 + - name: admin + uid: 1040 + gid: 1040 + groups: sudo + shell: /bin/zsh + password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0 + - name: developer + uid: 1050 + gid: 1050 + groups: + shell: /bin/zsh + password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0 diff --git a/group_vars/database/.mariadb.yml.swp b/group_vars/database/.mariadb.yml.swp new file mode 100644 index 0000000..90e18d8 Binary files /dev/null and b/group_vars/database/.mariadb.yml.swp differ diff --git a/group_vars/database/mariadb.yml b/group_vars/database/mariadb.yml new file mode 100644 index 0000000..5537112 --- /dev/null +++ b/group_vars/database/mariadb.yml @@ -0,0 +1,13 @@ +--- +mariadb: + databases: + - webapp + - webapp_backup + + users: + - name: webapp + password: w3b4pp + priv: '*.*:ALL' + - name: webapp_backup + password: w3b4pp_b4ckup + priv: '*.*:ALL' diff --git a/host_vars/db01/nameserver.yml b/host_vars/db01/nameserver.yml new file mode 100644 index 0000000..1b503bd --- /dev/null +++ b/host_vars/db01/nameserver.yml @@ -0,0 +1,4 @@ +--- + +nameserver: + local: 127.0.0.1 diff --git a/roles/debian/tasks/main.yml b/roles/debian/tasks/main.yml index 014fb60..3866d0d 100644 --- a/roles/debian/tasks/main.yml +++ b/roles/debian/tasks/main.yml @@ -28,3 +28,7 @@ copy: src: resolv.conf dest: /etc/resolv.conf + + - name: Debug + debug: + var: nameserver diff --git a/roles/debian/tasks/users.yml b/roles/debian/tasks/users.yml index 6a8af56..f110b9c 100644 --- a/roles/debian/tasks/users.yml +++ b/roles/debian/tasks/users.yml @@ -10,13 +10,7 @@ gid: "{{ item.gid }}" loop_control: label: "{{ item.name }}" - loop: - - name: root - gid: 0 - - name: admin - gid: 1040 - - name: developer - gid: 1050 + loop: "{{ users }}" - name: Users user: @@ -28,22 +22,7 @@ password: "{{ item.password }}" loop_control: label: "{{ item.name }}" - loop: - - name: root - uid: 0 - groups: sudo - shell: /bin/bash - password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0 - - name: admin - uid: 1040 - groups: sudo - shell: /bin/zsh - password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0 - - name: developer - uid: 1050 - groups: - shell: /bin/zsh - password: $6$R0En0ee9OeDp3ikb$Rl3aXOCw0Me9Jm8/0hTjgII2xm1L2K5/v1oAd0MoP13/Q7zT0YRNoF2TGlQ23jF7K90z8iVs4km8JvK.2JhkU0 + loop: "{{ users }}" - name: zsh config copy: diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml index 72d4fe3..ab6ffc8 100644 --- a/roles/mariadb/tasks/main.yml +++ b/roles/mariadb/tasks/main.yml @@ -21,9 +21,7 @@ community.mysql.mysql_db: login_unix_socket: /var/run/mysqld/mysqld.sock name: "{{ item }}" - loop: - - webapp - - webapp_backup + loop: "{{ mariadb.databases }}" - name: DB User mysql_user: @@ -31,12 +29,6 @@ password: "{{ item.password }}" priv: "{{ item.priv }}" login_unix_socket: /var/run/mysqld/mysqld.sock - loop: - - name: webapp - password: w3b4pp - priv: '*.*:ALL' - - name: webapp_backup - password: w3b4pp_b4ckup - priv: '*.*:ALL' + loop: "{{ mariadb.users }}" loop_control: label: "{{ item.name }}"