commit 7e792444cfb052f93f7c9b88f3932d60d6c74165
author Vnaumov <vnaumov@mirantis.com> Wed Nov 22 12:43:34 2017 +0300
committer Jakub Josef <jakub.josef@gmail.com> Tue Dec 19 12:19:31 2017 +0100
tree 3c94bb0f1787916785174aab94045b8bc13c53fa
parent 3daf8baf75670aab4b4f876eae5df6cbd38e1e56

Forward Rundeck main page through Proxy configurations

Change-Id: I27e6efb98ab8da229100ba4f0e2ec6523cb2143b

_modules/rundeck.py

diff --git a/_modules/rundeck.py b/_modules/rundeck.py
index c72067f..8911608 100644
--- a/_modules/rundeck.py
+++ b/_modules/rundeck.py
@@ -385,7 +385,6 @@
 
     if api_token:
         session.headers.update({
-            'Content-Type': 'application/json',
             'X-Rundeck-Auth-Token': api_token,
         })
     else:

rundeck/files/rundeck-config.properties

diff --git a/rundeck/files/rundeck-config.properties b/rundeck/files/rundeck-config.properties
index 78764ca..6543991 100644
--- a/rundeck/files/rundeck-config.properties
+++ b/rundeck/files/rundeck-config.properties
@@ -3,7 +3,11 @@
 
 rdeck.base=/var/lib/rundeck
 
+{%- if server.iframe.external_forward == True %}
+grails.serverURL={{ make_url(server.iframe) }}
+{%- else %}
 grails.serverURL={{ make_url(server.api) }}
+{%- endif %}
 
 loglevel.default=INFO
 rss.enabled=false

tests/pillar/server.sls

diff --git a/tests/pillar/server.sls b/tests/pillar/server.sls
index 459a9cc..61a6e78 100644
--- a/tests/pillar/server.sls
+++ b/tests/pillar/server.sls
@@ -12,6 +12,11 @@
       user: runbook
       private_key: private
       public_key: public
+    iframe:
+      external_forward: false
+      host: 10.20.0.3
+      port: 4440
+      https: false
     users:
       admin:
         name: admin