From ae18e8169ff56b404036f4e5fcc9cb4a73bc9377 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 18 Jan 2020 01:19:57 -0500
Subject: [PATCH 1/5] Group perms/concerns in wordpress/tasks/install.yml

---
 roles/wordpress/tasks/install.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml
index 6a8a21f9e..8652e0a0d 100644
--- a/roles/wordpress/tasks/install.yml
+++ b/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:

From 9308dc1c259bed3a940400e3d1d9412a04fde7a8 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 18 Jan 2020 01:26:30 -0500
Subject: [PATCH 2/5] Create munin/defaults/main.yml

---
 roles/munin/defaults/main.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 roles/munin/defaults/main.yml

diff --git a/roles/munin/defaults/main.yml b/roles/munin/defaults/main.yml
new file mode 100644
index 000000000..39031c933
--- /dev/null
+++ b/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

From 3e6bd219b828a0fc3294499fa0fa74280a74e069 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 18 Jan 2020 01:28:09 -0500
Subject: [PATCH 3/5] Clean & softcode munin/tasks/install.yml

---
 roles/munin/tasks/install.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/roles/munin/tasks/install.yml b/roles/munin/tasks/install.yml
index 19e258cca..423d22bc0 100644
--- a/roles/munin/tasks/install.yml
+++ b/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:

From cd56d5410930d24764a6925e5894b79b7897a60b Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 18 Jan 2020 01:34:37 -0500
Subject: [PATCH 4/5] Tighten up Transmission vars in default_vars.yml

---
 vars/default_vars.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 9fbbfd7af..d7ab97ae0 100644
--- a/vars/default_vars.yml
+++ b/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
 

From 397c6934a0ae4baff5f528be105bfbe1c3f063d9 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 18 Jan 2020 01:36:39 -0500
Subject: [PATCH 5/5] Tighten up vars in transmission/defaults/main.yml

---
 roles/transmission/defaults/main.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/roles/transmission/defaults/main.yml b/roles/transmission/defaults/main.yml
index 20918340c..91a2ff0b4 100644
--- a/roles/transmission/defaults/main.yml
+++ b/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!