Merge branch 'acmebot-pyopenssl' into bullseye

acmebot/tasks/main.yml

@@ -19,9 +19,16 @@
     repo: https://github.com/plinss/acmebot.git
     dest: /opt/acmebot
     version: "{{acmebot_version}}"
+    force: true
   environment:
     TMPDIR: /root/.ansible/tmp
 
+- name: fix over-specified requirements locally
+  lineinfile:
+    regexp: '^pyOpenSSL>=17\.5\.0'  # ,<20.0.0'
+    line: 'pyOpenSSL>=17.5.0'
+    path: /opt/acmebot/requirements.txt
+
 - name: add acmebot to path
   file:
     src: /opt/acmebot/acmebot

etherpad/defaults/main.yml

 ---
 
 etherpad_web_root: "/opt/etherpad"
-etherpad_version: "HEAD"
+etherpad_version: "1.8.11"
 
 etherpads: []
 

etherpad/handlers/main.yml

@@ -8,7 +8,7 @@
     daemon_reload: true
 
 - name: restart etherpad
-  debug:
-    var: item
-  when: item.value.changed
+  systemd:
+    name: "etherpad@{{ item.item.name }}.service"
+    state: restarted
   with_items: "{{ etherpad_config.results }}"

etherpad/tasks/main.yml

@@ -36,8 +36,10 @@
     repo: https://github.com/ether/etherpad-lite.git
     dest: "{{etherpad_web_root}}/repository"
     version: "{{etherpad_version|default('HEAD')}}"
+    force: true
   become: true
   become_user: etherpad
+  notify: restart etherpad
 
 - name: ensure we have a directory for etherpad configuration files
   file:

uwsgi-python/tasks/app.yml

@@ -202,6 +202,10 @@
     - "{{ app.app }}"
     - "{{ app.instance }}"
 
+- name: remount /tmp exec # noqa 303 503
+  command: mount -o rw,remount,exec /tmp
+  when: app_exectmp|default(false)
+
 - name: ensure we have a virtualenv  # noqa 403
   pip:
     requirements: "{{ app_path }}/{{ app_requirements_file }}"
@@ -238,6 +242,10 @@
     - "{{ app.app }}"
     - "{{ app.instance }}"
 
+- name: remount /tmp exec # noqa 303 503
+  command: mount -o rw,remount,noexec /tmp
+  when: app_exectmp|default(false)
+
 - name: Create bundler directories with user permissions
   file:
     path: "{{ item }}"

uwsgi-python/vars/pretix.yml

@@ -42,6 +42,7 @@ app_git_version: 'stable'  # release/2.4.x
 app_git_pip: true
 app_git_pip_query: '#egg=pretix&subdirectory=src'
 app_requirements_file: ''
+app_exectmp: true
 
 app_config_file: 'pretix.cfg'
 app_secret_config: false