Переглянути джерело

small fixes for monit, nextcloud, limesurvey

Thomas Buck 2 роки тому
джерело
коміт
da2578d190

+ 1
- 0
roles/limesurvey/tasks/limesurvey.yml Переглянути файл

6
     packages:
6
     packages:
7
     - php
7
     - php
8
     - libapache2-mod-php
8
     - libapache2-mod-php
9
+    - unzip
9
   tags:
10
   tags:
10
     - dependencies
11
     - dependencies
11
 
12
 

+ 1
- 1
roles/monitoring/tasks/monit.yml Переглянути файл

249
   when: postfix_config_file.stat.exists == True
249
   when: postfix_config_file.stat.exists == True
250
 
250
 
251
 - name: Copy sshd monit service config files into place
251
 - name: Copy sshd monit service config files into place
252
-  copy: src=etc_monit_conf.d_sshd dest=/etc/monit/conf.d/ssh
252
+  copy: src=etc_monit_conf.d_sshd dest=/etc/monit/conf.d/sshd
253
   notify: restart monit
253
   notify: restart monit
254
   when: sshd_config_file.stat.exists == True
254
   when: sshd_config_file.stat.exists == True
255
 
255
 

+ 1
- 1
roles/nextcloud/defaults/main.yml Переглянути файл

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

+ 12
- 2
roles/nextcloud/tasks/nextcloud.yml Переглянути файл

14
     - php-imap
14
     - php-imap
15
     - php-imagick
15
     - php-imagick
16
     - php-redis
16
     - php-redis
17
-    - php-mcrypt
18
     - php-mysql
17
     - php-mysql
19
     - php-xml
18
     - php-xml
20
     - php-zip
19
     - php-zip
28
   tags:
27
   tags:
29
     - dependencies
28
     - dependencies
30
 
29
 
30
+- name: Install NextCloud dependencies
31
+  apt:
32
+    name: "{{ packages }}"
33
+    state: present
34
+  vars:
35
+    packages:
36
+    - php-mcrypt
37
+  tags:
38
+    - dependencies
39
+  when: ansible_distribution_version == '9'
40
+
31
 - name: Create NextCloud temp directory
41
 - name: Create NextCloud temp directory
32
   file: path=/root/nextcloud state=directory
42
   file: path=/root/nextcloud state=directory
33
 
43
 
108
   lineinfile:
118
   lineinfile:
109
     path: /var/www/nextcloud/config/config.php
119
     path: /var/www/nextcloud/config/config.php
110
     insertafter: 'instanceid'
120
     insertafter: 'instanceid'
111
-    line: "  'trusted_domains' => array ('localhost', {{ virtual_domains | json_query('[*].name') | map('regex_replace', '(.*)', \"'cloud.\\1'\") | join(', ') }}),"
121
+    line: "  'trusted_domains' => array ('localhost', {{ virtual_domains | json_query('[*].name') | map('regex_replace', '^(.*)$', \"'\" + nextcloud_subdomain + \".\\1'\") | join(', ') }}),"
112
 
122
 
113
 - name: Create the Apache sites config files
123
 - name: Create the Apache sites config files
114
   template:
124
   template:

Завантаження…
Відмінити
Зберегти