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
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
francois
slapos
Commits
b1f85ddf
Commit
b1f85ddf
authored
Feb 28, 2017
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software.apache-frontend: Remove unecessary "raw" call
parent
24524587
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+1
-1
software/apache-frontend/instance-apache-frontend.cfg
software/apache-frontend/instance-apache-frontend.cfg
+16
-7
No files found.
software/apache-frontend/common.cfg
View file @
b1f85ddf
...
@@ -56,7 +56,7 @@ mode = 0644
...
@@ -56,7 +56,7 @@ mode = 0644
[template-apache-frontend]
[template-apache-frontend]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apache-frontend.cfg
url = ${:_profile_base_location_}/instance-apache-frontend.cfg
md5sum =
6d437f8a3836484d42bf9bf8d747e201
md5sum =
c86c435136f6b910b3dd7dcb84a789a2
output = ${buildout:directory}/template-apache-frontend.cfg
output = ${buildout:directory}/template-apache-frontend.cfg
mode = 0644
mode = 0644
...
...
software/apache-frontend/instance-apache-frontend.cfg
View file @
b1f85ddf
...
@@ -147,6 +147,15 @@ extra-context =
...
@@ -147,6 +147,15 @@ extra-context =
key http_port instance-parameter:configuration.plain_http_port
key http_port instance-parameter:configuration.plain_http_port
key https_port instance-parameter:configuration.port
key https_port instance-parameter:configuration.port
[software-release-path]
template-empty = ${template-empty:target}
template-slave-configuration = ${template-slave-configuration:target}
template-default-slave-virtualhost = ${template-default-slave-virtualhost:target}
template-cached-slave-virtualhost = ${template-cached-slave-virtualhost:target}
template-nginx-eventsource-slave-virtualhost = ${template-nginx-eventsource-slave-virtualhost:target}
template-nginx-notebook-slave-virtualhost = ${template-nginx-notebook-slave-virtualhost:target}
apache-location = ${apache-2.2:location}
[dynamic-custom-personal-template-slave-list]
[dynamic-custom-personal-template-slave-list]
< = jinja2-template-base
< = jinja2-template-base
template = ${template-slave-list:target}
template = ${template-slave-list:target}
...
@@ -172,12 +181,12 @@ extra-context =
...
@@ -172,12 +181,12 @@ extra-context =
key global_ipv6 slap-network-information:global-ipv6
key global_ipv6 slap-network-information:global-ipv6
key cache_port apache-configuration:cache-port
key cache_port apache-configuration:cache-port
key varnginx directory:varnginx
key varnginx directory:varnginx
raw empty_template ${template-empty:target}
key empty_template software-release-path:template-empty
raw template_custom_slave_configuration ${template-slave-configuration:target}
key template_custom_slave_configuration software-release-path:template-slave-configuration
raw template_default_slave_configuration ${template-default-slave-virtualhost:target}
key template_default_slave_configuration software-release-path:template-default-slave-virtualhost
raw template_cached_slave_configuration ${template-cached-slave-virtualhost:target}
key template_cached_slave_configuration software-release-path:template-cached-slave-virtualhost
raw template_eventsource_slave_configuration ${template-nginx-eventsource-slave-virtualhost:target}
key template_eventsource_slave_configuration software-release-path:template-nginx-eventsource-slave-virtualhost
raw template_notebook_slave_configuration ${template-nginx-notebook-slave-virtualhost:target}
key template_notebook_slave_configuration software-release-path:template-nginx-notebook-slave-virtualhost
raw software_type single-custom-personal
raw software_type single-custom-personal
section logrotate_dict logrotate
section logrotate_dict logrotate
section frontend_configuration frontend-configuration
section frontend_configuration frontend-configuration
...
@@ -202,7 +211,7 @@ extra-context =
...
@@ -202,7 +211,7 @@ extra-context =
template = ${template-apache-frontend-configuration:target}
template = ${template-apache-frontend-configuration:target}
rendered = $${apache-configuration:frontend-configuration}
rendered = $${apache-configuration:frontend-configuration}
extra-context =
extra-context =
raw httpd_home ${apache-2.2:location}
key httpd_home software-release-path:apache-location
key httpd_mod_ssl_cache_directory apache-directory:mod-ssl
key httpd_mod_ssl_cache_directory apache-directory:mod-ssl
key domain instance-parameter:configuration.domain
key domain instance-parameter:configuration.domain
key document_root apache-directory:document-root
key document_root apache-directory:document-root
...
...
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