Merge branch 'nodered-no-apache' of https://github.com/jvonau/iiab into jvonau-nodered-no-apache

roles/nginx/README.md

@@ -5,7 +5,7 @@
    Until "Native" NGINX is later implemented for that IIAB App/Service — allowing it to move up to *Section ii.* below.
 
    And potentially later moving it up to *Section i.* if its Apache support is dropped!
-   
+
    (Background: IIAB Apps/Services are generally [Ansible roles](https://github.com/iiab/iiab/wiki/IIAB-Contributors-Guide#ansible) that live in [/opt/iiab/iiab/roles](https://github.com/iiab/iiab/tree/master/roles))
 
 2. Without PHP available via FastCGI, any function at all for PHP-based applications validates NGINX.
@@ -33,11 +33,11 @@
       * nextcloud
       * sugarizer
       * wordpress
+      * nodered
 
    3. These support Apache but ***NOT*** "Native" NGINX.  They use a "Shim" to [proxy_pass](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) from NGINX to Apache on port 8090.  See [roles/3-base-server/tasks/main.yml#L11](../3-base-server/tasks/main.yml#L11) for a list of ~6 IIAB Apps/Services that auto-enable Apache.
       * elgg
       * moodle [*, PLEASE HELP IF YOU CAN: [#2785](https://github.com/iiab/iiab/issues/2785)]
-      * nodered
 
    4. These each run their own web server or non-web / backend services, e.g. off of their own [unique port(s)](https://github.com/iiab/iiab/wiki/IIAB-Networking#list-of-ports--services) (IIAB home pages link directly to these destinations).  In future we'd like mnemonic URL's for all of these: (e.g. http://box/calibre, http://box/archive, http://box/kalite)
       * bluetooth

roles/nodered/tasks/install.yml

@@ -1,11 +1,11 @@
-- name: "Set 'apache_install: True' and 'apache_enabled: True'"
+#- name: "Set 'apache_install: True' and 'apache_enabled: True'"
-  set_fact:
+#  set_fact:
-    apache_install: True
+#    apache_install: True
-    apache_enabled: True
+#    apache_enabled: True
 
-- name: APACHE - run 'httpd' role
+#- name: APACHE - run 'httpd' role
-  include_role:
+#  include_role:
-    name: httpd
+#    name: httpd
 
 
 # 2019-01-16: @jvonau's PR #1403 moved installation of Node.js (8.x for now) &
@@ -120,10 +120,10 @@
     # mode: '0666'
 
 # SEE ALSO THE apache2_module SECTION IN roles/httpd/tasks/main.yml
-- name: Enable proxy_wstunnel apache2 module
+#- name: Enable proxy_wstunnel apache2 module
-  apache2_module:
+#  apache2_module:
-    state: present
+#    state: present
-    name: proxy_wstunnel
+#    name: proxy_wstunnel
 
 
 # RECORD Node-RED AS INSTALLED

roles/nodered/tasks/main.yml

@@ -42,7 +42,7 @@
 #- name: Enable/Disable/Restart Apache if primary
 - name: SHIM FOR NOW SO ALWAYS DO THE...Enable/Disable/Restart Apache
   include_tasks: apache.yml
-  #when: not nginx_enabled
+  when: not nginx_enabled
 
 - name: Enable/Disable/Restart NGINX if primary
   include_tasks: nginx.yml

roles/nodered/templates/nodered-nginx.conf.j2

@@ -1,3 +1,11 @@
 location /nodered/ {
-  proxy_pass http://127.0.0.1:{{ apache_port }}/nodered/;
+  proxy_pass http://127.0.0.1:1880/nodered/;
+}
+
+location /nodered/debug/ws/ {
+  proxy_pass http://127.0.0.1:1880/nodered/debug/ws;
+}
+
+location /nodered/comms/ {
+  proxy_pass http://127.0.0.1:1880/nodered/comms;
 }