Merge branch 'master' into s3backup

host_vars/guarana.yml

@@ -5,6 +5,7 @@
 #       However, the devices do not exist on the VMs and
 #       the log is spammed every 10 seconds with service messages.
 
+
 pull_groups:
   - server
   - irb

local.yml

@@ -90,14 +90,6 @@
     - role: buzzer-panel
     - role: dashboard
 
-    - role: sync-files
-      sync:
-        mount_src: "karo.upb.de:/backup/dhcp"
-        backup_dir: "/backup"
-        working_dir: "/etc"
-        files:
-          - "dhcpd-fsmi.conf"
-
     - role: dhcp-server
       dhcp:
         port: 0

roles/buzzer-panel/templates/vhost.conf

 {{ ansible_managed | comment }}
 
 server {
-    listen       443 ssl http2;
-    listen       [::]:443 ssl http2;
+    listen       443 ssl;
+    listen       [::]:443 ssl;
+    http2 on;
     server_name  buzzer.die-fachschaft.de;
 
     include /etc/nginx/tls.conf;

roles/dashboard/templates/vhost.conf

 {{ ansible_managed | comment }}
 
 server {
-    listen       443 ssl http2;
-    listen       [::]:443 ssl http2;
+    listen       443 ssl;
+    listen       [::]:443 ssl;
+    http2 on;
     server_name  dashboard.die-fachschaft.de;
 
     include /etc/nginx/tls.conf;

roles/fsmiweb-services/tasks/main.yml

@@ -95,7 +95,7 @@
 - name: install fsmiweb_services python package
   pip:
     name: "{{ fsmiweb_services.fsmiweb_path }}/websitePlugins"
-    extra_args: "--user -e"
+    extra_args: "--break-system-packages --user -e"
   become: yes
   become_user: "{{ fsmiweb_services.user }}"
   when: fsmiweb_services_repo_result is succeeded

roles/fsmiweb-wochenmail/tasks/main.yml

@@ -8,7 +8,7 @@
 - name: install wochenmail dependency caldav
   pip:
     name: '{{ fsmiweb_wochenmail.pip_dependencies }}'
-    extra_args: '--user'
+    extra_args: '--break-system-packages --user'
   become: yes
   become_user: '{{ fsmiweb_wochenmail.user }}'
 
@@ -39,7 +39,7 @@
 - name: install fsmiweb_services python package
   pip:
     name: "{{ fsmiweb_wochenmail.path }}"
-    extra_args: "--user -e"
+    extra_args: "--break-system-packages --user -e"
   become: yes
   become_user: "{{ fsmiweb_wochenmail.user }}"
   when: fsmiweb_wochenmail_repo_result is succeeded

roles/klausurarchiv/templates/vhost.conf

@@ -4,8 +4,9 @@ upstream app_server {
 
 server {
   # if no Host match, close the connection to prevent host spoofing
-  listen 443 ssl http2 default_server;
-  listen [::]:443 ssl http2 default_server;
+  listen 443 ssl default_server;
+  listen [::]:443 ssl default_server;
+  http2 on;
 
   include /etc/nginx/tls.conf;
   
@@ -13,8 +14,9 @@ server {
 }
 
 server {
-  listen 443 ssl http2 deferred;
-  listen [::]:443 ssl http2 deferred;
+  listen 443 ssl deferred;
+  listen [::]:443 ssl deferred;
+  http2 on;
   client_max_body_size 4G;
 
   server_name {{klausurarchiv.domains|join(' ')}};

ssh-keys/bbick.pub

-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHUrepYKhbmRAk7eqwcB41vmKetLBDhGrA1n36CXk/Niwm7EHEzUdxI/eD6pt02heb8ocl9Se6xfFAVDZ0tWp/2DTYt1tnwD2Gyt/POLDWmUWxSXhl2bAdvYjlLje4x26NVx6MXOt/9zcBQc73wf2RYQI/+nL1tbdIc1d3ZHqhFN2uhiT67yinRCAsM4ACbllWV/OlTHVGYHPZWQp5FoJTz9WACd8YJ194fPtZtqOkiHWr3k3AWVsYCXsHmAUVAE2hlfRMfmFTNsLa665pVmQtD90UpliMqiKuQIlugLoK7MXMwlfU2RcjLP8aNPU1DU/zH2XE5zDup/hiZprayaB6ki6SgDhm1RK8rFcDy0uc4mDX/1YynSbLojIJmZLD8JXmaCOo9t7gyMziCXv03zXl9Opt9dUNvtp4Lfqr3N4Zuggd8W4Dhm41kZQ3Q0y0FY51QBO0ykBnt0t5y3SQdGxjCdhHcVAlNq53yCFSJbKa0Sj/vha0rjY0LFpn9DwQuvLL0freeCSV+kbj2L3N5enerD0MdgSfWHOREQXZhLb0JSVEeOa8gxzldrnSzMBLP0ScOAkU3TfyfCigJEdj4ZGM0zB5Thz36htqUMPB3LrXTHjOyWnhaxIKwFWtEKp6oie+MxWYkcmHbqVZThR+fbTZ8JQsmXTKhs1e7mVaRJgsfQ== bjornbick@MacBook-Pro-von-Bjorn.local