Merge pull request #346 from iiab/master

sync from iiab:master

roles/munin/defaults/main.yml

@@ -0,0 +1,8 @@
+# munin_install: True
+# munin_enabled: True
+
+# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
+# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
+
+munin_username: Admin
+munin_password: changeme

roles/munin/tasks/install.yml

@@ -7,7 +7,6 @@
       - libcgi-fast-perl
       - libapache2-mod-fcgid
     state: present
-  #tags: download
   when: is_debuntu | bool
 
 - name: "Install 2 packages: munin, munin-node (OS's other than debuntu)"
@@ -16,7 +15,6 @@
       - munin
       - munin-node
     state: present
-  #tags: download
   when: not is_debuntu
 
 - name: Install /etc/munin/munin.conf and Apache's munin24.conf, from templates
@@ -33,8 +31,8 @@
 - name: Establish username/password Admin/changeme in /etc/munin/munin-htpasswd
   htpasswd:
     path: /etc/munin/munin-htpasswd
-    name: Admin
-    password: changeme
+    name: "{{ munin_username}}"    # Admin
+    password: "{{ munin_password }}"    # changeme
 
 - name: If MySQL is enabled, let Munin monitor it
   copy:

roles/transmission/defaults/main.yml

@@ -1,6 +1,8 @@
 # Transmission is a BitTorrent downloader for large Content Packs etc
 # transmission_install: False
 # transmission_enabled: False
+# transmission_username: Admin
+# transmission_password: changeme
 
 # Transmission download directory & general owner/group
 # transmission_download_dir: "{{ content_base }}/transmission/"    # /library/transmission/
@@ -33,9 +35,5 @@
 #    then click "Scan content folder for videos" (can take many minutes!)
 # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO
 
-# Transmission administrative account
-# transmission_username: Admin
-# transmission_password: changeme
-
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!

roles/wordpress/tasks/install.yml

@@ -83,7 +83,7 @@
     dest: "{{ wp_abs_path }}/wp-config.php"
     owner: root
     group: "{{ apache_user }}"    # DO WE REALLY STILL WANT THIS FOR NGINX?
-    mode: '0660'    # Others strongly recommend '0600' (or do Apache/NGINX really need group read & write permissions?)
+    mode: '0660'    # Others strongly recommend '0600' (or do PHP/Apache/NGINX really need group read & write permissions?)
 
 - name: Install etc/{{ apache_config_dir }}/wordpress.conf from template, for http://box{{ wp_url }} via Apache
   template:

vars/default_vars.yml

@@ -469,6 +469,8 @@ sugarizer_port: 8089
 # Transmission is a BitTorrent downloader for large Content Packs etc
 transmission_install: False
 transmission_enabled: False
+transmission_username: Admin
+transmission_password: changeme
 
 # Transmission download directory & general owner/group
 transmission_download_dir: "{{ content_base }}/transmission/"    # /library/transmission/
@@ -501,10 +503,6 @@ transmission_kalite_languages:
 #    then click "Scan content folder for videos" (can take many minutes!)
 # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO
 
-# Transmission administrative account
-transmission_username: Admin
-transmission_password: changeme
-
 awstats_install: True
 awstats_enabled: True