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
a9c07db9
Commit
a9c07db9
authored
Jan 17, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
powerdns: Fix circular referencing on the instantiation
parent
281d3774
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
software/powerdns/instance-powerdns-replicate.cfg.jinja2
software/powerdns/instance-powerdns-replicate.cfg.jinja2
+2
-2
software/powerdns/software.cfg
software/powerdns/software.cfg
+1
-1
No files found.
software/powerdns/instance-powerdns-replicate.cfg.jinja2
View file @
a9c07db9
...
@@ -81,7 +81,7 @@ username = admin
...
@@ -81,7 +81,7 @@ username = admin
[monitor-instance-parameter]
[monitor-instance-parameter]
monitor-httpd-port = 8099
monitor-httpd-port = 8099
cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
username =
${monitor-instance-parameter:username}
username =
admin
password = ${monitor-htpasswd:passwd}
password = ${monitor-htpasswd:passwd}
[monitor-conf-parameters]
[monitor-conf-parameters]
...
@@ -109,7 +109,7 @@ config-{{parameter}} = {{ value }}
...
@@ -109,7 +109,7 @@ config-{{parameter}} = {{ value }}
{% endfor -%}
{% endfor -%}
config-{{ slave_list_name }} = {{ json_module.dumps(slave_instance_list) }}
config-{{ slave_list_name }} = {{ json_module.dumps(slave_instance_list) }}
config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }}
config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }}
config-monitor-username =
${monitor-instance-parameter:username}
config-monitor-username =
admin
config-monitor-password = ${monitor-htpasswd:passwd}
config-monitor-password = ${monitor-htpasswd:passwd}
[publish-information]
[publish-information]
...
...
software/powerdns/software.cfg
View file @
a9c07db9
...
@@ -38,7 +38,7 @@ mode = 640
...
@@ -38,7 +38,7 @@ mode = 640
[template-dns-replicate]
[template-dns-replicate]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-powerdns-replicate.cfg.jinja2
url = ${:_profile_base_location_}/instance-powerdns-replicate.cfg.jinja2
md5sum =
3699d0751632e0c11b466342789e27a3
md5sum =
46acd4ed071df8d7139dcd0434be42eb
mode = 0644
mode = 0644
[iso-list]
[iso-list]
...
...
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