Merge branch 'main' of github.com:DO1JLR/ansible_playbook_webserver

DO1JLR · Jan 28, 2021 · 4be56bd · 4be56bd
2 parents f0a924d + 0cc7d59
commit 4be56bd
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -73,3 +73,6 @@
 [submodule "roles/do1jlr.rspamd"]
 	path = roles/do1jlr.rspamd
 	url = https://github.com/roles-ansible/ansible_role_rspamd.git
+[submodule "roles/unattended_upgrades"]
+	path = roles/unattended_upgrades
+	url = https://github.com/jnv/ansible-role-unattended-upgrades.git
diff --git a/group_vars/all.yml → group_vars/all/vars.yml b/group_vars/all.yml → group_vars/all/vars.yml
diff --git a/group_vars/all/vault.yml b/group_vars/all/vault.yml
@@ -0,0 +1,7 @@
+$ANSIBLE_VAULT;1.1;AES256
+36663863373338383561336138323362326461643035366564653064343831303331373862373465
+6465396462326630383532376465653965353131623265300a333866303861663238306234326663
+64353530653265333866363938626431326139376136653631626635303430313437333431623637
+3931616565633732320a636166306637383739313666353564646235336332636565363266393961
+63363263626263303535623465633639313865383634323935663363383532336662656662633262
+3537383036623661313530306532376237633132633234613936
diff --git a/roles/do1jlr.mailserver_preperation b/roles/do1jlr.mailserver_preperation
diff --git a/roles/dotfiles b/roles/dotfiles
diff --git a/roles/gitea b/roles/gitea
diff --git a/roles/unattended_upgrades b/roles/unattended_upgrades
diff --git a/site.yml b/site.yml
@@ -11,6 +11,7 @@
     - { role: base, tags: [default,packages,base]}
     - { role: ranger, tags: [packages,ranger]}
     - { role: bat, tags: [packages,bat], when: [ansible_os_family == 'Debian']}
+    - { role: unattended_upgrades, tags: [default,unattended,unattended_upgrades,security], become: true, when: ansible_distribution == 'Debian'}
 
 - name: user specific roles for all hosts
   hosts: all
+1 −1		.github/workflows/ansible-linting-check.yml
+3 −2		README.md
+3 −2		defaults/main.yml
+10 −3		tasks/check-variables.yml
+5 −0		tasks/create_user.yml
+13 −2		tasks/main.yml
+1 −0		templates/gitea.service.j2