Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
33d9b99d
Commit
33d9b99d
authored
Feb 21, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: simplification in monitoring frontend request
Conflicts: software/slaprunner/instance-runner.cfg
parent
aa644e37
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
7 deletions
+1
-7
software/slaprunner/instance-runner-export.cfg.in
software/slaprunner/instance-runner-export.cfg.in
+0
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-6
No files found.
software/slaprunner/instance-runner-export.cfg.in
View file @
33d9b99d
...
@@ -64,4 +64,3 @@ url = $${monitor-frontend:config-url}/$${deploy-index:filename}
...
@@ -64,4 +64,3 @@ url = $${monitor-frontend:config-url}/$${deploy-index:filename}
# Extends publish section with resilient parameters
# Extends publish section with resilient parameters
[publish-connection-informations]
[publish-connection-informations]
<= resilient-publish-connection-parameter
<= resilient-publish-connection-parameter
monitor_url = https://$${monitor-frontend:connection-domain}/index.cgi
software/slaprunner/instance-runner.cfg
View file @
33d9b99d
...
@@ -23,7 +23,6 @@ parts =
...
@@ -23,7 +23,6 @@ parts =
slapos-repo-config
slapos-repo-config
cron-entry-prepare-software
cron-entry-prepare-software
deploy-instance-parameters
deploy-instance-parameters
publish-monitor-frontend
{% if slapparameter_dict.get('custom-frontend-backend-url') %}
{% if slapparameter_dict.get('custom-frontend-backend-url') %}
custom-frontend-promise
custom-frontend-promise
{% endif %}
{% endif %}
...
@@ -402,10 +401,6 @@ config-url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor-
...
@@ -402,10 +401,6 @@ config-url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor-
config-domain = $${slap-parameter:frontend-domain}
config-domain = $${slap-parameter:frontend-domain}
return = site_url domain
return = site_url domain
[publish-monitor-frontend]
recipe = slapos.cookbook:publish
monitor_url = https://$${monitor-frontend:connection-domain}/index.cgi
#--------------------------------------
#--------------------------------------
#--
#--
#-- Send informations to SlapOS Master
#-- Send informations to SlapOS Master
...
@@ -419,7 +414,7 @@ access_url = $${:url}/login
...
@@ -419,7 +414,7 @@ access_url = $${:url}/login
url = https://$${request-frontend:connection-domain}
url = https://$${request-frontend:connection-domain}
ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port}
ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port}
webdav_url = https://$${request-frontend:connection-domain}/share
webdav_url = https://$${request-frontend:connection-domain}/share
monitor_url =
$${:url}:$${cgi-httpd-configuration-file:listening-port}/$${deploy-index:filename}
monitor_url =
https://$${monitor-frontend:connection-domain}/index.cgi
#---------------------------
#---------------------------
#--
#--
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment