more fixes for ubuntu 16 and 18

molecule/local/molecule.yml

@@ -22,21 +22,21 @@ platforms:
     groups:
       - group1
 
-  - name: ansible_test-01_2
-    image: paulfantom/ubuntu-molecule:18.04
-    privileged: True
-    command: /sbin/init
-    capabilities:
-      - SYS_ADMIN    
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:ro"        
-    groups:
-      - group1
+#  - name: ansible_test-01_2
+#      image: paulfantom/ubuntu-molecule:18.04
+#      privileged: True
+#      command: /sbin/init
+#      capabilities:
+#        - SYS_ADMIN    
+#      volumes:
+#        - "/sys/fs/cgroup:/sys/fs/cgroup:ro"        
+#      groups:
+#        - group1
 
-  - name: ansible_test-02
-    image: ubuntu:trusty     
-    groups:
-      - groupold
+#    - name: ansible_test-02
+#      image: ubuntu:trusty     
+#      groups:
+#        - groupold
 #
 #  - name: ansible_test-03
 #    image: centos/systemd 

tasks/config_thruk.yml

@@ -65,7 +65,9 @@
     src=thruk_local.conf.j2
     dest=/etc/thruk/thruk_local.conf
     owner=www-data group=www-data mode=660
-  notify: Restart Thruk
+  notify: 
+  - Restart Apache
+  - Restart Thruk
 
 - name: link images/logos for thruk theme Exfoliation
   file: src={{ item.src }} dest={{ item.dest }} state=link
@@ -79,9 +81,11 @@
   apache2_module:
     state: present
     name: fastcgi
+  when: thruk_enable_fastcgi
 
 # enables the Apache2 module "fcgid"
-- name: enable fastcgi on apache for thruk installation
+- name: enable fcgid on apache for thruk installation
   apache2_module:
     state: present
     name: fcgid
+

tasks/install_thruk.yml

@@ -9,4 +9,6 @@
 - name: Install thruk packages
   package: name={{ thruk_packages| join(',') }} state=present
   environment:
-    DEBIAN_FRONTEND: noninteractive
+    DEBIAN_FRONTEND: noninteractive
+  notify: Restart Apache
+

tasks/tests.yml

@@ -11,4 +11,10 @@
     state: started
 
 - name: test if "{{ nagios_live_sock }}" exist for thruk connection
-  file: path="{{ nagios_live_sock }}" state=file
+  file: path="{{ nagios_live_sock }}" state=file
+
+- name: ensure thruk is started
+  service:
+    name: "thruk"
+    state: started
+

tasks/thruk_fixes.yml

@@ -3,4 +3,10 @@
 
 - name: delete /etc/apache2/conf-enabled/thruk_cookie_auth_vhost.conf fixes https://github.com/sni/Thruk/issues/504
   file: path='/etc/apache2/conf-enabled/thruk_cookie_auth_vhost.conf' state=absent
-  notify: Reload Apache
+  notify: Restart Apache
+
+- name: ensure /usr/share/thruk/var exists
+  file:
+    path: /usr/share/thruk/var
+    state: directory
+

vars/Debian.yml

@@ -48,3 +48,6 @@ thruk_dependencies:
 
 thruk_packages:
   - thruk # on repository
+
+thruk_enable_fastcgi: true
+

vars/RedHat.yml

@@ -5,3 +5,6 @@ thruk_dependencies:
 
 thruk_packages:
   - thruk # on repository
+
+thruk_enable_fastcgi: false
+

vars/Ubuntu-18.yml

@@ -47,3 +47,6 @@ thruk_dependencies:
 
 thruk_packages:
   - thruk # on repository
+
+thruk_enable_fastcgi: false
+