diff options
| -rw-r--r-- | README.org | 8 | ||||
| -rw-r--r-- | common-playbook.yml | 2 | ||||
| -rw-r--r-- | group_vars/all.yml | 2 | ||||
| -rw-r--r-- | inventory.yml | 2 | ||||
| -rw-r--r-- | roles/pad/tasks/main.yml | 8 | ||||
| -rw-r--r-- | roles/pad/vars/main.yml | 4 |
6 files changed, 13 insertions, 13 deletions
@@ -490,10 +490,4 @@ ansible-galaxy role install systemli.etherpad nodemon -e '*' -w ../../roles/pad/ -x "vagrant destroy -f && vagrant up --provision" Backing up: - -- name: Load vars - hosts: all - tags: always - tasks: - - include_vars: - file: prod-vars.yml +ansible-playbook -i inventory.yml backup-playbook.yml diff --git a/common-playbook.yml b/common-playbook.yml index a4c41e8..4b12e4d 100644 --- a/common-playbook.yml +++ b/common-playbook.yml @@ -15,7 +15,7 @@ - edit - name: Set up proxy hosts: pad - tags: proxy + tags: proxy, pad-proxy roles: - pad-proxy - name: Set up pad diff --git a/group_vars/all.yml b/group_vars/all.yml index 97eb83e..f9be97a 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -43,6 +43,6 @@ media_protect_root: true protect_stream_with_password: false restreaming_platforms: [] - +update_cache: true backup_dir_on_server: "~{{emacsconf_user}}/backups/" local_backup_dir: "backups/" diff --git a/inventory.yml b/inventory.yml index 76d796e..aa8732d 100644 --- a/inventory.yml +++ b/inventory.yml @@ -31,6 +31,7 @@ prod: ansible_ssh_user: orga ansible_python_interpreter: /usr/bin/python3 ansible_become: true + update_cache: false wiki: ansible_host: front0.emacsconf.org remote_user: orga @@ -43,6 +44,7 @@ prod: ansible_ssh_user: orga ansible_python_interpreter: /usr/bin/python3 ansible_become: true + update_cache: false media: ansible_host: media.emacsconf.org remote_user: sachac diff --git a/roles/pad/tasks/main.yml b/roles/pad/tasks/main.yml index e2836a6..6e32ff6 100644 --- a/roles/pad/tasks/main.yml +++ b/roles/pad/tasks/main.yml @@ -5,7 +5,7 @@ block: - name: Add GPG apt: - update_cache: yes + update_cache: "{{ update_cache }}" name: - gpg - sudo @@ -17,15 +17,15 @@ - name: Add nodesource repository ansible.builtin.apt_repository: repo: deb https://deb.nodesource.com/node_20.x nodistro main - update_cache: yes + update_cache: "{{ update_cache }}" - name: Install packages apt: - update_cache: yes + update_cache: "{{ update_cache }}" name: - git - systemd - sudo - - nodejs + - nodejs=20.19.5-1nodesource1 - mariadb-server - mariadb-client state: present diff --git a/roles/pad/vars/main.yml b/roles/pad/vars/main.yml index 757b434..dfe2bfc 100644 --- a/roles/pad/vars/main.yml +++ b/roles/pad/vars/main.yml @@ -14,3 +14,7 @@ etherpad_soffice: "null" etherpad_edit_only: "true" etherpad_mysql_database_user: etherpad etherpad_mysql_database_name: etherpad +etherpad_db_type: mysql +etherpad_mysql_database_host: localhost +etherpad_mysql_database_password: "{{ etherpad_database_password }}" +etherpad_min_node_version: "18.18.2" |