Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
salt-state
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FFFFM
salt-state
Commits
3e0503fc
Commit
3e0503fc
authored
5 years ago
by
MyIgel
Browse files
Options
Downloads
Patches
Plain Diff
Replace iteritems with items to be python3 compatible
parent
830198de
No related branches found
No related tags found
1 merge request
!446
Resolve "replace iteritems for python3"
Pipeline
#21923
passed
5 years ago
Stage: highstate
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
letsencrypt/init.sls
+1
-1
1 addition, 1 deletion
letsencrypt/init.sls
nginx/vhosts.sls
+1
-1
1 addition, 1 deletion
nginx/vhosts.sls
with
2 additions
and
2 deletions
letsencrypt/init.sls
+
1
−
1
View file @
3e0503fc
...
...
@@ -72,7 +72,7 @@ certbot.timer:
# request initial certs
{% for setname, domainlist in pillar['letsencrypt']['domainsets'].
iter
items() %}
{% for setname, domainlist in pillar['letsencrypt']['domainsets'].items() %}
certbot_certonly_initial_{{ setname }}_{{ domainlist|join('+') }}:
cmd.run:
...
...
This diff is collapsed.
Click to expand it.
nginx/vhosts.sls
+
1
−
1
View file @
3e0503fc
{% for name, vhost in pillar.get('nginx', {}).get('vhosts', {}).
iter
items() %}
{% for name, vhost in pillar.get('nginx', {}).get('vhosts', {}).items() %}
{% set cert_path = "/etc/letsencrypt/live/{cn}/fullchain.pem".format(cn=vhost.ssl.common_name) %}
{% set key_path = "/etc/letsencrypt/live/{cn}/privkey.pem".format(cn=vhost.ssl.common_name) %}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment