From 732547b9e7ea77799966356ce533c049e608d553 Mon Sep 17 00:00:00 2001
From: George Hunt <georgejhunt@gmail.com>
Date: Fri, 18 May 2018 22:35:09 +0000
Subject: [PATCH] softcode sugarizer port, open iptables if
 services_externally_visible

---
 roles/0-init/tasks/main.yml                       | 10 +++++-----
 roles/network/templates/gateway/iiab-gen-iptables |  2 ++
 roles/sugarizer/defaults/main.yml                 |  1 +
 roles/sugarizer/tasks/main.yml                    | 10 +++++-----
 roles/sugarizer/templates/sugarizer.conf          |  4 ++--
 roles/sugarizer/templates/sugarizer.ini           |  2 +-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml
index c731a6a6a..66730837e 100644
--- a/roles/0-init/tasks/main.yml
+++ b/roles/0-init/tasks/main.yml
@@ -102,11 +102,11 @@
 #  when: elgg_enabled or rachel_enabled or owncloud_enabled or phpmyadmin_enabled or wordpress_enabled or iiab_menu_install
 
 # Commenting out MongoDB on a trial basis, for a more basic/lightweight Sugarizer, per https://github.com/iiab/iiab/pull/427
-# - name: Turn on mongodb if sugarizer enabled
-#   set_fact:
-#     mongodb_install: True
-#     mongodb_enabled: True
-#   when: sugarizer_enabled
+- name: Turn on mongodb if sugarizer enabled
+  set_fact:
+     mongodb_install: True
+     mongodb_enabled: True
+  when: sugarizer_enabled
 
 # There might be other db's
 - name: Turn on PostgreSQL if Moodle or Pathagar enabled
diff --git a/roles/network/templates/gateway/iiab-gen-iptables b/roles/network/templates/gateway/iiab-gen-iptables
index 284db36ef..7ec8f3bf0 100755
--- a/roles/network/templates/gateway/iiab-gen-iptables
+++ b/roles/network/templates/gateway/iiab-gen-iptables
@@ -57,6 +57,7 @@ services_externally_visible={{ services_externally_visible }}
 calibre_port={{ calibre_port }}
 kiwix_port={{ kiwix_port }}
 kalite_server_port={{ kalite_server_port }}
+sugarizer_port={{ sugarizer_port }}
 block_DNS={{ block_DNS }}
 captive_portal_enabled={{ captive_portal_enabled }}
 
@@ -89,6 +90,7 @@ if [ "$services_externally_visible" == "True" ]; then
     $IPTABLES -A INPUT -p tcp --dport $kiwix_port -m state --state NEW -i $wan -j ACCEPT
     $IPTABLES -A INPUT -p tcp --dport $kalite_server_port -m state --state NEW -i $wan -j ACCEPT
     $IPTABLES -A INPUT -p tcp --dport $calibre_port -m state --state NEW -i $wan -j ACCEPT
+    $IPTABLES -A INPUT -p tcp --dport $sugarizer_port -m state --state NEW -i $wan -j ACCEPT
 fi
 
 if [ "$iiab_gateway_enabled" == "True" ]; then
diff --git a/roles/sugarizer/defaults/main.yml b/roles/sugarizer/defaults/main.yml
index 3ad4b80a8..18349676b 100644
--- a/roles/sugarizer/defaults/main.yml
+++ b/roles/sugarizer/defaults/main.yml
@@ -1,6 +1,7 @@
 sugarizer_install: True
 sugarizer_enabled: False
 sugarizer_location: '{{ doc_root }}'
+sugarizer_port: 8089
 sugarizer_version: 'sugarizer-1.0'
 sugarizer_server_version: 'sugarizer-server-1.0'
 npm_exists: False
diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index 31c77535d..44c59ff52 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -94,12 +94,12 @@
   with_items:
     - { src: 'sugarizer.service.j2' , dest: '/etc/systemd/system/sugarizer.service'}
     - { src: 'sugarizer.ini' , dest: '{{ sugarizer_location }}/{{ sugarizer_server_version }}/env/sugarizer.ini' }
-#     - { src: 'sugarizer.conf' , dest: '/etc/apache2/sites-available' }
+     - { src: 'sugarizer.conf' , dest: '/etc/apache2/sites-available' }
 
-#- name: Create the symlink enabling the rewrite
-#  file: src=/etc/apache2/sites-available/sugarizer.conf
-#        dest=/etc/apache2/sites-enabled/sugarizer.conf
-#        state=link
+- name: Create the symlink enabling the rewrite
+  file: src=/etc/apache2/sites-available/sugarizer.conf
+        dest=/etc/apache2/sites-enabled/sugarizer.conf
+        state=link
 
 - name: Create the express framework for Node.js (OS's other than Fedora 18)
   shell: npm install
diff --git a/roles/sugarizer/templates/sugarizer.conf b/roles/sugarizer/templates/sugarizer.conf
index 780491144..19bb98363 100644
--- a/roles/sugarizer/templates/sugarizer.conf
+++ b/roles/sugarizer/templates/sugarizer.conf
@@ -1,3 +1,3 @@
-RewriteRule       ^/sugarizer(.*)$  http://localhost:8089/sugarizer$1 [P,L]
-ProxyPassReverse  /sugarizer        http://localhost:8010/sugarizer
+RewriteRule       ^/sugarizer(.*)$  http://localhost:{{ sugaarizer_port }}/sugarizer$1 [P,L]
+ProxyPassReverse  /sugarizer        http://localhost:{{ sugarizer_port }}/sugarizer
 ProxyRequests     Off
diff --git a/roles/sugarizer/templates/sugarizer.ini b/roles/sugarizer/templates/sugarizer.ini
index 44024ee3b..afcd97d19 100644
--- a/roles/sugarizer/templates/sugarizer.ini
+++ b/roles/sugarizer/templates/sugarizer.ini
@@ -3,7 +3,7 @@ name = Sugarizer Server
 description = Your Sugarizer Server
 
 [web]
-port = 8089
+port = {{ sugarizer_port }}
 
 [security]
 min_password_size = 4