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
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
17a01dc9
Commit
17a01dc9
authored
Apr 05, 2019
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
powerdns: fix instanciation with empty slave_instance_list
This was causing "No JSON object could be decoded"
parent
c9f106a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
software/powerdns/instance-powerdns.cfg
software/powerdns/instance-powerdns.cfg
+1
-1
software/powerdns/software.cfg
software/powerdns/software.cfg
+1
-1
No files found.
software/powerdns/instance-powerdns.cfg
View file @
17a01dc9
...
...
@@ -120,7 +120,7 @@ monitor-password = $${monitor-publish-parameters:monitor-password}
#####################
# Power DNS Slave configuration
#
{% set slave_instance_list = json_module.loads(slapparameter_dict.get('extra_slave_instance_list', '')) %}
{% set slave_instance_list = json_module.loads(slapparameter_dict.get('extra_slave_instance_list', '
[]
')) %}
# Iter through slave list to prepare configuration
{% for slave in slave_instance_list %}
...
...
software/powerdns/software.cfg
View file @
17a01dc9
...
...
@@ -25,7 +25,7 @@ mode = 0644
[template-powerdns]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-powerdns.cfg
md5sum =
b2301de110ba95be46121dc18d7ca54
4
md5sum =
d9589e84d3e18ef341e478d3352fee0
4
output = ${buildout:directory}/template-powerdns.cfg
mode = 0644
...
...
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