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
isaak yansane-sisk
slapos
Commits
0b5e44c3
Commit
0b5e44c3
authored
Aug 08, 2014
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apache-frontend: publish https access for default slave
parent
d92849d0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+1
-1
software/apache-frontend/templates/apache-custom-slave-list.cfg.in
...apache-frontend/templates/apache-custom-slave-list.cfg.in
+1
-1
No files found.
software/apache-frontend/common.cfg
View file @
0b5e44c3
...
@@ -80,7 +80,7 @@ mode = 0644
...
@@ -80,7 +80,7 @@ mode = 0644
[template-slave-list]
[template-slave-list]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/templates/apache-custom-slave-list.cfg.in
url = ${:_profile_base_location_}/templates/apache-custom-slave-list.cfg.in
md5sum =
1c2a47e7e2aa58b4f350ed29ab1a98fe
md5sum =
bae669cdc917c68186a387903478a53d
mode = 640
mode = 640
[template-slave-configuration]
[template-slave-configuration]
...
...
software/apache-frontend/templates/apache-custom-slave-list.cfg.in
View file @
0b5e44c3
...
@@ -189,7 +189,7 @@ extra-context =
...
@@ -189,7 +189,7 @@ extra-context =
raw http_port {{ http_port }}
raw http_port {{ http_port }}
{{ '\n' }}
{{ '\n' }}
{% do slave_publish_dict.update(**{'slave-reference':slave_instance.get('slave_reference'), 'public-ipv4':public_ipv4, 'domain':slave_instance.get('custom_domain'), 'url':"http://%s" % slave_instance.get('custom_domain'), 'site_url':"http://%s" % slave_instance.get('custom_domain')}) %}
{% do slave_publish_dict.update(**{'slave-reference':slave_instance.get('slave_reference'), 'public-ipv4':public_ipv4, 'domain':slave_instance.get('custom_domain'), 'url':"http://%s" % slave_instance.get('custom_domain'), 'site_url':"http://%s" % slave_instance.get('custom_domain')
, 'secure_access': 'https://%s' % slave_instance.get('custom_domain')
}) %}
{% endif -%}
{% endif -%}
...
...
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