Commit eaf74d42 authored by Lars Beckers's avatar Lars Beckers
Browse files

Merge branch 'acmebot-pyopenssl' into bullseye

parents 915d9481 27929523
Pipeline #3015 passed with stage
in 1 minute and 27 seconds
...@@ -19,9 +19,16 @@ ...@@ -19,9 +19,16 @@
repo: https://github.com/plinss/acmebot.git repo: https://github.com/plinss/acmebot.git
dest: /opt/acmebot dest: /opt/acmebot
version: "{{acmebot_version}}" version: "{{acmebot_version}}"
force: true
environment: environment:
TMPDIR: /root/.ansible/tmp 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 - name: add acmebot to path
file: file:
src: /opt/acmebot/acmebot src: /opt/acmebot/acmebot
......
--- ---
etherpad_web_root: "/opt/etherpad" etherpad_web_root: "/opt/etherpad"
etherpad_version: "HEAD" etherpad_version: "1.8.11"
etherpads: [] etherpads: []
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
daemon_reload: true daemon_reload: true
- name: restart etherpad - name: restart etherpad
debug: systemd:
var: item name: "etherpad@{{ item.item.name }}.service"
when: item.value.changed state: restarted
with_items: "{{ etherpad_config.results }}" with_items: "{{ etherpad_config.results }}"
...@@ -36,8 +36,10 @@ ...@@ -36,8 +36,10 @@
repo: https://github.com/ether/etherpad-lite.git repo: https://github.com/ether/etherpad-lite.git
dest: "{{etherpad_web_root}}/repository" dest: "{{etherpad_web_root}}/repository"
version: "{{etherpad_version|default('HEAD')}}" version: "{{etherpad_version|default('HEAD')}}"
force: true
become: true become: true
become_user: etherpad become_user: etherpad
notify: restart etherpad
- name: ensure we have a directory for etherpad configuration files - name: ensure we have a directory for etherpad configuration files
file: file:
......
...@@ -202,6 +202,10 @@ ...@@ -202,6 +202,10 @@
- "{{ app.app }}" - "{{ app.app }}"
- "{{ app.instance }}" - "{{ 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 - name: ensure we have a virtualenv # noqa 403
pip: pip:
requirements: "{{ app_path }}/{{ app_requirements_file }}" requirements: "{{ app_path }}/{{ app_requirements_file }}"
...@@ -238,6 +242,10 @@ ...@@ -238,6 +242,10 @@
- "{{ app.app }}" - "{{ app.app }}"
- "{{ app.instance }}" - "{{ 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 - name: Create bundler directories with user permissions
file: file:
path: "{{ item }}" path: "{{ item }}"
......
...@@ -42,6 +42,7 @@ app_git_version: 'stable' # release/2.4.x ...@@ -42,6 +42,7 @@ app_git_version: 'stable' # release/2.4.x
app_git_pip: true app_git_pip: true
app_git_pip_query: '#egg=pretix&subdirectory=src' app_git_pip_query: '#egg=pretix&subdirectory=src'
app_requirements_file: '' app_requirements_file: ''
app_exectmp: true
app_config_file: 'pretix.cfg' app_config_file: 'pretix.cfg'
app_secret_config: false app_secret_config: false
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment