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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
4fb830f3
Commit
4fb830f3
authored
May 17, 2019
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix "caddy-frontend: Always fill-in key download url"
Use unreal address to avoid any tries for network connectivity.
parent
736be1f5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
.../caddy-frontend/templates/apache-custom-slave-list.cfg.in
+2
-2
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
4fb830f3
...
@@ -30,7 +30,7 @@ md5sum = d62aefe002ec13875924e4c219914795
...
@@ -30,7 +30,7 @@ md5sum = d62aefe002ec13875924e4c219914795
[template-slave-list]
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
be47649fba6b44e136c3a8eb538443f3
md5sum =
def9d8430ac19a40f3b457830f1feefc
[template-slave-configuration]
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
filename = templates/custom-virtualhost.conf.in
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
4fb830f3
...
@@ -33,7 +33,7 @@ create = true
...
@@ -33,7 +33,7 @@ create = true
{% if master_key_download_url %}
{% if master_key_download_url %}
{% do kedifa_updater_mapping.append((master_key_download_url, master_certificate, apache_certificate)) %}
{% do kedifa_updater_mapping.append((master_key_download_url, master_certificate, apache_certificate)) %}
{% else %}
{% else %}
{% do kedifa_updater_mapping.append(('
https://
notreadyyet', master_certificate, apache_certificate)) %}
{% do kedifa_updater_mapping.append(('notreadyyet', master_certificate, apache_certificate)) %}
{% endif %}
{% endif %}
{% if slave_kedifa_information %}
{% if slave_kedifa_information %}
...
@@ -57,7 +57,7 @@ output = {{ plugin_directory }}/${:name}
...
@@ -57,7 +57,7 @@ output = {{ plugin_directory }}/${:name}
{% if slave_kedifa %}
{% if slave_kedifa %}
{% set key_download_url = slave_kedifa.get('key-download-url') %}
{% set key_download_url = slave_kedifa.get('key-download-url') %}
{% else %}
{% else %}
{% set key_download_url = '
http://
notreadyyet' %}
{% set key_download_url = 'notreadyyet' %}
{% endif %}
{% endif %}
{% set slave_type = slave_instance.get('type', '') %}
{% set slave_type = slave_instance.get('type', '') %}
{% set slave_section_title = 'dynamic-template-slave-instance-%s' % slave_reference %}
{% set slave_section_title = 'dynamic-template-slave-instance-%s' % slave_reference %}
...
...
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