Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
apache-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
apache-formula
Commits
241f2be8
Commit
241f2be8
authored
10 years ago
by
Nitin Madhok
Browse files
Options
Downloads
Plain Diff
Merge pull request #44 from RyPeck/feature/optional_template_register_sites
Add optional templating to register_site files
parents
77398445
a83f74c1
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
apache/register_site.sls
+7
-0
7 additions, 0 deletions
apache/register_site.sls
pillar.example
+4
-0
4 additions, 0 deletions
pillar.example
with
11 additions
and
0 deletions
apache/register_site.sls
+
7
−
0
View file @
241f2be8
...
...
@@ -38,6 +38,13 @@
- user: root
- group: root
- mode: 775
{% if 'template' in pillar['apache']['register-site'][site] and 'defaults' in pillar['apache']['register-site'][site] %}
- template: jinja
- defaults:
{% for key, value in pillar['apache']['register-site'][site]['defaults'].iteritems() %}
{{ key }}: {{ value }}
{% endfor %}
{% endif %}
- watch_in:
- cmd: {{ a2modid }}
- module: apache-reload
...
...
This diff is collapsed.
Click to expand it.
pillar.example
+
4
−
0
View file @
241f2be8
...
...
@@ -81,6 +81,10 @@ apache:
name: 'my name'
path: 'salt://path/to/sites-available/conf/file'
state: 'enabled'
# Optional - use managed file as Jinja Template
#template: true
#defaults:
# custom_var: "default value"
modules:
enabled: # List modules to enable
...
...
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