Update modules

Author: DO1JLR

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "roles/base"]
-	path = roles/do1jlr.base
-	url = https://github.com/roles-ansible/ansible_role_base.git
-  branch = main
 [submodule "roles/ranger"]
 	path = roles/do1jlr.ranger
 	url = https://github.com/roles-ansible/ansible_role_ranger.git
@@ -128,3 +124,6 @@
 [submodule "roles/geerlingguy.mysql"]
 	path = roles/geerlingguy.mysql
 	url = https://github.com/geerlingguy/ansible-role-mysql.git
+[submodule "roles/do1jlr.packages"]
+	path = roles/l3d.packages
+	url = https://github.com/roles-ansible/ansible_role_packages.git

group_vars/all/vars.yml

@@ -1,11 +1,11 @@
 ---
 # version check for all supported roles
 submodules_versioncheck: true
-check_ansible_version: '2.14.1'
+check_ansible_version: '2.15.2'
 
-# do1jlr.base
-base__pkg_contrib: true
-base__pkg_non_free_firmware: true
+# l3d.packages
+l3d_pkgs__install_advanced: true
+l3d_pkgs__install_cli: true
 
 # do1jlr.ntp
 ntp_set_time_zone: true

host_vars/mail01.l3d.space/vault.yml

@@ -121,6 +121,8 @@ nginx_sites:
   - name: 'waffel.li'
   - name: 'www.waffel.li'
   - name: 'www.camp.waffel.li'
+  - name: '37c3.waffel.li'
+  - name: 'www.37c3.waffel.li'
   - name: 'www.c3woc.org'
   - name: 'c3woc.eu'
   - name: 'www.c3woc.eu'

host_vars/web01.l3d.space/vars.yml

@@ -7,7 +7,7 @@
 - name: General roles for all hosts
   hosts: all
   roles:
-    - {role: do1jlr.base, tags: [default, packages, base]}
+    - {role: l3d.packages, tags: [packages, general]}
     - {role: do1jlr.ranger, tags: [packages, ranger]}
     - {role: gantsign.bat, tags: [packages, bat], when: [ansible_os_family == 'Debian']}
     - {role: unattended_upgrades, tags: [default, unattended, unattended_upgrades, security], become: true, when: ansible_distribution == 'Debian'}

roles/do1jlr.base

@@ -0,0 +1,14 @@
+server {
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
+
+        server_name 37c3.waffel.li;
+
+        include snippets/tls_parameters_{{ site.name }}.snippet.conf;
+        include snippets/tls_certificate_{{ site.name }}.snippet.conf;
+        include snippets/logging_{{ site.name }}.snippet.conf;
+
+        location / {
+                return 308 https://pads.c3w.at/form/#/2/form/view/YSPEX5XoeWAe4rKiLK9GcIEJ+yhPn5pHVJOQciZeDh8/;
+        }
+}

roles/l3d.packages

@@ -0,0 +1,14 @@
+server {
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
+
+        server_name www.37c3.waffel.li;
+
+        include snippets/tls_parameters_{{ site.name }}.snippet.conf;
+        include snippets/tls_certificate_{{ site.name }}.snippet.conf;
+        include snippets/logging_{{ site.name }}.snippet.conf;
+
+        location / {
+                return 308 https://37c3.waffel.li$request_uri;
+        }
+}