diff --git a/roles/aur.inc/tasks/install.yml b/roles/aur.inc/tasks/install.yml
index bfb0999..d6a70c3 100644
--- a/roles/aur.inc/tasks/install.yml
+++ b/roles/aur.inc/tasks/install.yml
@@ -44,7 +44,6 @@
shell: "{{pre_cmd}}"
args:
chdir: /var/tmp/{{aurjson.json.results[0].PackageBase}}
- warn: false
when: pre_cmd
register: debugCustom
diff --git a/roles/dmz_exim/tasks/main.yml b/roles/dmz_exim/tasks/main.yml
index 0b3f57c..db01377 100644
--- a/roles/dmz_exim/tasks/main.yml
+++ b/roles/dmz_exim/tasks/main.yml
@@ -58,7 +58,7 @@
User=root
Group=spamd
Type=oneshot
- ExecStart=/usr/bin/vendor_perl/sa-update --allowplugins
+ ExecStart=/usr/bin/vendor_perl/sa-update
# Exit status: 0 = updated, 1 = no updates available
SuccessExitStatus=0 1
ExecStart=/usr/bin/vendor_perl/sa-compile
diff --git a/roles/dmz_nginx/tasks/main.yml b/roles/dmz_nginx/tasks/main.yml
index 98dabb7..9210ed4 100644
--- a/roles/dmz_nginx/tasks/main.yml
+++ b/roles/dmz_nginx/tasks/main.yml
@@ -15,7 +15,7 @@
name: "{{item}}"
state: present
with_items:
- - nginx-mainline
+# - nginx-mainline # nginx-mainline must now be built from official PKGBUILD :-(
- php-fpm
### UPSTREAM END ⇒ ###
diff --git a/roles/dmz_prosody_front/tasks/main.yml b/roles/dmz_prosody_front/tasks/main.yml
index 5732734..aa7af2d 100644
--- a/roles/dmz_prosody_front/tasks/main.yml
+++ b/roles/dmz_prosody_front/tasks/main.yml
@@ -27,19 +27,19 @@
allow_duplicates: true
vars:
packages:
- - lua52-event
- lua52-lpty
- prosody-mod-auth-imap-hg
- prosody-mod-auto-accept-subscriptions-hg
- prosody-mod-filter-chatstates-hg
- prosody-mod-http-upload-external-hg
- prosody-mod-offline-email-hg
- - prosody-mod-smacks
- prosody-mod-throttle_presence
aur_user: git
+ # - lua52-event
# - prosody-mod-log-auth
# - prosody-mod-mam-archive
# - prosody-mod-mam-muc
+ # - prosody-mod-smacks
### UPSTREAM END ⇒ ###
- name: merge upstream
diff --git a/roles/nextcloud_back/handlers/main.yml b/roles/nextcloud_back/handlers/main.yml
index 373693e..4da8e85 100644
--- a/roles/nextcloud_back/handlers/main.yml
+++ b/roles/nextcloud_back/handlers/main.yml
@@ -3,10 +3,10 @@
# Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license.
# Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing.
-- name: restart loolwsd.service
+- name: restart coolwsd.service
systemd:
daemon_reload: true
- name: loolwsd.service
+ name: coolwsd.service
state: restarted
- name: stop uwsgi@nextcloud.service
diff --git a/roles/nextcloud_back/tasks/main.yml b/roles/nextcloud_back/tasks/main.yml
index d8e0bbb..9cf0515 100644
--- a/roles/nextcloud_back/tasks/main.yml
+++ b/roles/nextcloud_back/tasks/main.yml
@@ -68,9 +68,11 @@
become: true
become_user: postgres
-#- name: change some loolwsd settings
+#- name: change some coolwsd settings
# xml:
-# path: /etc/loolwsd/loolwsd.xml
+# path: /etc/coolwsd/coolwsd.xml
+# owner: cool
+# group: cool
# xpath: "{{item.key}}"
# value: "{{item.value}}"
# with_dict:
@@ -81,34 +83,38 @@
# /config/admin_console/username: '{{loolwsd_admin_user}}'
# /config/admin_console/password: '{{loolwsd_admin_password}}'
# notify:
-# - restart loolwsd.service
+# - restart coolwsd.service
-- name: change some loolwsd settings
+- name: change some coolwsd settings
lineinfile:
- path: /etc/loolwsd/loolwsd.xml
+ path: /etc/coolwsd/coolwsd.xml
+ owner: cool
+ group: cool
backrefs: true
regexp: '^(.*<{{item.key}}\s[^>]*>)[^<]*(<.*)$'
line: '\g<1>{{item.value}}\2'
with_dict:
server_name: '{{net_soa}}:443'
memproportion: '{{loolwsd_maxmem_asdouble}}'
- 'enable\s[^>]*SSL[^>]*between loolwsd and the network': 'false'
+ 'enable\s[^>]*SSL[^>]*between coolwsd and the network': 'false'
termination: 'true'
'as_scheme\s[^>]*SSL': 'false'
- 'enable\s[^>]*SSL[^>]*between storage and loolwsd': 'false'
+ 'enable\s[^>]*SSL[^>]*between storage and coolwsd': 'false'
username: '{{loolwsd_admin_user}}'
password: '{{loolwsd_admin_password}}'
notify:
- - restart loolwsd.service
+ - restart coolwsd.service
-- name: allow Nextcloud to connect to loolwsd
+- name: allow Nextcloud to connect to coolwsd
lineinfile:
- path: /etc/loolwsd/loolwsd.xml
+ path: /etc/coolwsd/coolwsd.xml
+ owner: cool
+ group: cool
regexp: '(?:.*\.)?{{net_soa | replace(".", "\.")}}'
insertafter: '