Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Commits
28a6f951
Commit
28a6f951
authored
Feb 21, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: publish the ipv4 address of the monitoring interface
Conflicts: software/slaprunner/instance-runner.cfg
parent
64082672
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
software/slaprunner/instance-runner-export.cfg.in
software/slaprunner/instance-runner-export.cfg.in
+1
-0
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+2
-1
No files found.
software/slaprunner/instance-runner-export.cfg.in
View file @
28a6f951
...
@@ -40,6 +40,7 @@ parts +=
...
@@ -40,6 +40,7 @@ parts +=
deploy-settings-cgi
deploy-settings-cgi
deploy-status-cgi
deploy-status-cgi
make-rss
make-rss
monitor-frontend
monitor-promise
monitor-promise
setup-static-files
setup-static-files
certificate-authority
certificate-authority
...
...
software/slaprunner/instance-runner.cfg
View file @
28a6f951
...
@@ -39,6 +39,7 @@ parts =
...
@@ -39,6 +39,7 @@ parts =
deploy-settings-cgi
deploy-settings-cgi
deploy-status-cgi
deploy-status-cgi
make-rss
make-rss
monitor-frontend
monitor-promise
monitor-promise
setup-static-files
setup-static-files
certificate-authority
certificate-authority
...
@@ -401,8 +402,8 @@ backend_url = $${slaprunner:access-url}
...
@@ -401,8 +402,8 @@ backend_url = $${slaprunner:access-url}
access_url = $${:url}/login
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}
monitor_url = $${:url}:$${cgi-httpd-configuration-file:listening-port}/$${deploy-index:filename}
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}
#---------------------------
#---------------------------
#--
#--
...
...
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