summaryrefslogtreecommitdiffstats
path: root/roles/pad
diff options
context:
space:
mode:
Diffstat (limited to 'roles/pad')
-rw-r--r--roles/pad/tasks/main.yml10
-rw-r--r--roles/pad/templates/settings.json4
2 files changed, 8 insertions, 6 deletions
diff --git a/roles/pad/tasks/main.yml b/roles/pad/tasks/main.yml
index 7d71f59..9851d66 100644
--- a/roles/pad/tasks/main.yml
+++ b/roles/pad/tasks/main.yml
@@ -10,11 +10,12 @@
- sudo
- name: Add nodesource key
apt_key:
- url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
+ id: 2F59B5F99B1BE0B4
+ keyserver: keyserver.ubuntu.com
state: present
- name: Add nodesource repository
ansible.builtin.apt_repository:
- repo: deb https://deb.nodesource.com/node_13.x buster main
+ repo: deb https://deb.nodesource.com/node_20.x nodistro main
update_cache: yes
- name: Install packages
apt:
@@ -38,6 +39,7 @@
- name: Set up etherpad as the etherpad user
tags: etherpad-src
become: true
+ become_user: "{{ etherpad_user }}"
block:
- name: Install etherpad
git:
@@ -102,7 +104,7 @@
- name: Wait for OK
tags: create-pads
uri:
- url: "http://localhost:9001/api/1/createPad?apikey={{ etherpad_api_key }}&padID={{etherpad_year}}"
+ url: "https://{{ etherpad_server_name }}/api/1/createPad?apikey={{ etherpad_api_key }}&padID={{etherpad_year}}"
register: _result
until: _result.status == 200
retries: 720
@@ -113,5 +115,5 @@
- name: Create pads
tags: create-pads
uri:
- url: "http://localhost:9001/api/1/createPad?apikey={{ etherpad_api_key }}&padID={{etherpad_year}}-{{ item.slug }}"
+ url: "https://{{ etherpad_server_name }}/api/1/createPad?apikey={{ etherpad_api_key }}&padID={{etherpad_year}}-{{ item.slug }}"
loop: "{{ talks | json_query('talks[*]') }}"
diff --git a/roles/pad/templates/settings.json b/roles/pad/templates/settings.json
index dbbbda1..977a562 100644
--- a/roles/pad/templates/settings.json
+++ b/roles/pad/templates/settings.json
@@ -283,7 +283,7 @@
* Pad creation is only via the API.
* This applies both to group pads and regular pads.
*/
- "editOnly": {{ not etherpad_load_test }},
+ "editOnly": {{ (not etherpad_load_test) | bool | lower }},
/*
* If true, all css & js will be minified before sending to the client.
@@ -530,7 +530,7 @@
*
* WARNING: this will disable security on the instance.
*/
- "loadTest": {{ etherpad_load_test }},
+ "loadTest": {{ etherpad_load_test | bool | lower }},
/**
* Disable dump of objects preventing a clean exit