Fixed Kamailio dependency, Nextcloud settings task syntax.

diff --git a/README.org b/README.org
index 28f12fcfc2f530a84976d82e77ff4f78295b5309..b35e1b65ba15f73d53c550874ded10f0196b372f 100644 (file)
--- a/README.org
+++ b/README.org
@@ -2287,8 +2287,8 @@ not be started before the ~wg0~ device has appeared.
   copy:
     content: |
       [Unit]
+      After=wg-quick@wg0.service
       Requires=sys-devices-virtual-net-wg0.device
-      After=sys-devices-virtual-net-wg0.device
     dest: /etc/systemd/system/kamailio.service.d/depend.conf
   notify: Reload Systemd.
 #+END_SRC
@@ -4683,11 +4683,13 @@ unedited copy of the parameters SMTP and /not/ by Sendmail nor Qmail.
   become: yes
   lineinfile:
     path: /var/www/nextcloud/config/config.php
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
     insertbefore: "^[)];"
     firstmatch: yes
   loop:
   - regexp: "^ *'default_phone_region' *=> *'.*', *$"
-    line: "  'default_phone_region' => '{{ nextcloud_phone_reg }}',"
+    line: "  'default_phone_region' => '{{ nextcloud_region }}',"
 
   - regexp: "^ *'maintenance_window_start' *=> "
     line: "  'maintenance_window_start' => 9,"
@@ -4695,11 +4697,11 @@ unedited copy of the parameters SMTP and /not/ by Sendmail nor Qmail.
   - regexp: "^ *'mail_smtpmode' *=>"
     line: "  'mail_smtpmode' => 'sendmail',"
   - regexp: "^ *'mail_sendmailmode' *=>"
-  - line: "  'mail_sendmailmode' => 'pipe',"
+    line: "  'mail_sendmailmode' => 'pipe',"
   - regexp: "^ *'mail_from_address' *=>"
-  - line: "  'mail_from_address' => 'webmaster',"
+    line: "  'mail_from_address' => 'webmaster',"
   - regexp: "^ *'mail_domain' *=>"
-  - line: "^ *'mail_domain' => 'core.small.private',"
+    line: "  'mail_domain' => 'core.small.private',"
   when: nextcloud.stat.exists
 #+END_SRC
 

diff --git a/roles_t/core/tasks/main.yml b/roles_t/core/tasks/main.yml
index 879fd0c3c5f3775362d96f1f4a95dc4a0cd89a6d..e96f1568f9c36ff6fee7e046d62c968e8eef3bda 100644 (file)
--- a/roles_t/core/tasks/main.yml
+++ b/roles_t/core/tasks/main.yml
@@ -879,11 +879,13 @@
   become: yes
   lineinfile:
     path: /var/www/nextcloud/config/config.php
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
     insertbefore: "^[)];"
     firstmatch: yes
   loop:
   - regexp: "^ *'default_phone_region' *=> *'.*', *$"
-    line: "  'default_phone_region' => '{{ nextcloud_phone_reg }}',"
+    line: "  'default_phone_region' => '{{ nextcloud_region }}',"
 
   - regexp: "^ *'maintenance_window_start' *=> "
     line: "  'maintenance_window_start' => 9,"
@@ -891,11 +893,11 @@
   - regexp: "^ *'mail_smtpmode' *=>"
     line: "  'mail_smtpmode' => 'sendmail',"
   - regexp: "^ *'mail_sendmailmode' *=>"
-  - line: "  'mail_sendmailmode' => 'pipe',"
+    line: "  'mail_sendmailmode' => 'pipe',"
   - regexp: "^ *'mail_from_address' *=>"
-  - line: "  'mail_from_address' => 'webmaster',"
+    line: "  'mail_from_address' => 'webmaster',"
   - regexp: "^ *'mail_domain' *=>"
-  - line: "^ *'mail_domain' => 'core.small.private',"
+    line: "  'mail_domain' => 'core.small.private',"
   when: nextcloud.stat.exists
 
 - name: Create /Nextcloud/dbbackup.cnf.

diff --git a/roles_t/front/tasks/main.yml b/roles_t/front/tasks/main.yml
index 26ce4a768fbc5cafe00770be151e82c1909dfe6d..eb564b4437ea30259f3443d25d1732a837a59b76 100644 (file)
--- a/roles_t/front/tasks/main.yml
+++ b/roles_t/front/tasks/main.yml
@@ -430,8 +430,8 @@
   copy:
     content: |
       [Unit]
+      After=wg-quick@wg0.service
       Requires=sys-devices-virtual-net-wg0.device
-      After=sys-devices-virtual-net-wg0.device
     dest: /etc/systemd/system/kamailio.service.d/depend.conf
   notify: Reload Systemd.