small fixes for monit, nextcloud, limesurvey

roles/limesurvey/tasks/limesurvey.yml

@@ -6,6 +6,7 @@
     packages:
     - php
     - libapache2-mod-php
+    - unzip
   tags:
     - dependencies
 

roles/monitoring/tasks/monit.yml

@@ -249,7 +249,7 @@
   when: postfix_config_file.stat.exists == True
 
 - name: Copy sshd monit service config files into place
-  copy: src=etc_monit_conf.d_sshd dest=/etc/monit/conf.d/ssh
+  copy: src=etc_monit_conf.d_sshd dest=/etc/monit/conf.d/sshd
   notify: restart monit
   when: sshd_config_file.stat.exists == True
 

roles/nextcloud/defaults/main.yml

@@ -4,7 +4,7 @@ nextcloud_domain: "{{ nextcloud_subdomain }}.{{ domain }}"
 # When you increase the version, run this manually after installing / upgrading:
 #  cd /var/www/nextcloud
 #  sudo -u www-data php occ upgrade
-nextcloud_version: "15.0.5"
+nextcloud_version: "22.2.0"
 
 nextcloud_admin_username: "{{ main_user_name }}"
 nextcloud_admin_password: "{{ lookup('password', secret + '/' + 'nextcloud_admin_password length=32') }}"

roles/nextcloud/tasks/nextcloud.yml

@@ -14,7 +14,6 @@
     - php-imap
     - php-imagick
     - php-redis
-    - php-mcrypt
     - php-mysql
     - php-xml
     - php-zip
@@ -28,6 +27,17 @@
   tags:
     - dependencies
 
+- name: Install NextCloud dependencies
+  apt:
+    name: "{{ packages }}"
+    state: present
+  vars:
+    packages:
+    - php-mcrypt
+  tags:
+    - dependencies
+  when: ansible_distribution_version == '9'
+
 - name: Create NextCloud temp directory
   file: path=/root/nextcloud state=directory
 
@@ -108,7 +118,7 @@
   lineinfile:
     path: /var/www/nextcloud/config/config.php
     insertafter: 'instanceid'
-    line: "  'trusted_domains' => array ('localhost', {{ virtual_domains | json_query('[*].name') | map('regex_replace', '(.*)', \"'cloud.\\1'\") | join(', ') }}),"
+    line: "  'trusted_domains' => array ('localhost', {{ virtual_domains | json_query('[*].name') | map('regex_replace', '^(.*)$', \"'\" + nextcloud_subdomain + \".\\1'\") | join(', ') }}),"
 
 - name: Create the Apache sites config files
   template: