yves
/
home-server
1
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

misc. fixes for new versions of software 

nginx / ndk / lua are stuck because upstream switched to openresty
master
Yves G 2022-12-04 17:08:39 +01:00
parent 32e259d777
commit 08b4c1be4a
8 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/aur.inc/tasks/install.yml
View File

@ -44,7 +44,6 @@
shell: "{{pre_cmd}}"
args:
chdir: /var/tmp/{{aurjson.json.results[0].PackageBase}}
warn: false
when: pre_cmd
register: debugCustom

2
roles/dmz_exim/tasks/main.yml
View File

@ -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

2
roles/dmz_nginx/tasks/main.yml
View File

@ -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 ⇒ ###

4
roles/dmz_prosody_front/tasks/main.yml
View File

@ -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

4
roles/nextcloud_back/handlers/main.yml
View File

@ -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

34
roles/nextcloud_back/tasks/main.yml
View File

@ -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: '<host\s.*{{net_soa | replace(".", "\\.")}}'
line: ' <host desc="Regex pattern of hostname to allow or deny." allow="true">(?:.*\.)?{{net_soa | replace(".", "\.")}}</host>'
insertafter: '<wopi desc="Allow/deny wopi storage.'
notify:
- restart loolwsd.service
- restart coolwsd.service
- name: ensure Nextcloud ownership
block:
@ -177,8 +183,6 @@
}
H;x;b array' \
"{{nextcloud_conf}}/config.php"
args:
warn: false
when:
- (check_conf_arrays_1.stdout is defined)
- (check_conf_arrays_1.stdout != '')
@ -477,10 +481,10 @@
- (check_nextcloud_installed.stdout is defined)
- (check_nextcloud_installed.stdout != '')
- name: enable loolwsd.service
- name: enable coolwsd.service
systemd:
daemon_reload: true
name: loolwsd.service
name: coolwsd.service
enabled: true
- name: enable Nextcloud

6
roles/pyruse/templates/pyruse.json.j2
View File

@ -984,15 +984,15 @@
"args": { "level": "INFO", "message": "Port-Knock accepted from {thatIP}" }
}
],
"Warn of package errors with loolwsd": [
"Warn of package errors with coolwsd": [
{
"filter": "filter_equals",
"args": { "field": "SYSLOG_IDENTIFIER", "value": "loolwsd" }
"args": { "field": "SYSLOG_IDENTIFIER", "value": "coolwsd" }
},
{
"filter": "filter_pcreAny",
"args": { "field": "MESSAGE", "re": [
"^/usr/bin/loolwsd: error ",
"^/usr/bin/coolwsd: error ",
"^FATAL:",
"^Failed "
] },

9
roles/slapd/tasks/main.yml
View File

@ -40,8 +40,7 @@
Group=ldap
RuntimeDirectory=openldap
RuntimeDirectoryMode=0775
ExecStart=
ExecStart=/usr/bin/slapd -u ldap -g ldap -h 'ldap:// ldapi://%%2Frun%%2Fshared_sockets%%2Fldapi'
Environment="SLAPD_URLS=ldap:// ldapi://%%2Frun%%2Fshared_sockets%%2Fldapi"
dest: /etc/systemd/system/slapd.service.d/shared_sockets.conf
mode: 0644
notify:
@ -75,7 +74,7 @@
include /etc/openldap/schema/nis.schema
include /etc/openldap/schema/misc.schema
insertafter: '^include'
validate: slaptest -f %s -F /etc/openldap/slapd.d/ -u
validate: bash -c 'rm -rf /etc/openldap/slapd.d/* && slaptest -f %s -F /etc/openldap/slapd.d/ && chgrp -R ldap /etc/openldap/slapd.d && chmod -R g=u /etc/openldap/slapd.d'
notify:
- restart slapd.service
@ -91,7 +90,7 @@
index sn pres,sub,eq
index dc eq
insertafter: '^index'
validate: slaptest -f %s -F /etc/openldap/slapd.d/ -u
validate: bash -c 'rm -rf /etc/openldap/slapd.d/* && slaptest -f %s -F /etc/openldap/slapd.d/ && chgrp -R ldap /etc/openldap/slapd.d && chmod -R g=u /etc/openldap/slapd.d'
notify:
- restart slapd.service
@ -111,7 +110,7 @@
by dn.base="cn=root,{{ldap_root}}" write
by * read
insertbefore: '^# Sample access control policy'
validate: slaptest -f %s -F /etc/openldap/slapd.d/ -u
validate: bash -c 'rm -rf /etc/openldap/slapd.d/* && slaptest -f %s -F /etc/openldap/slapd.d/ && chgrp -R ldap /etc/openldap/slapd.d && chmod -R g=u /etc/openldap/slapd.d'
notify:
- restart slapd.service