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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Aurel
slapos
Commits
68bae853
Commit
68bae853
authored
9 years ago
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-master sr: fix apachedex parameters, also add --default value
parent
47a66664
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
software/slapos-master/instance-balancer.cfg.in
software/slapos-master/instance-balancer.cfg.in
+5
-3
software/slapos-master/software.cfg
software/slapos-master/software.cfg
+1
-1
No files found.
software/slapos-master/instance-balancer.cfg.in
View file @
68bae853
...
@@ -212,12 +212,13 @@ extra-context =
...
@@ -212,12 +212,13 @@ extra-context =
# XXX - Hard coded values for slapos and vifib.
# XXX - Hard coded values for slapos and vifib.
[apachedex-erp5-parameters]
[apachedex-erp5-parameters]
default_parameter =
apache-log-list = ${logrotate:backup}/apache-access.log-%(date)s.gz
apache-log-list = ${logrotate:backup}/apache-access.log-%(date)s.gz
base-list =
base-list =
'+slapos.vifib.com' '/VirtualHostBase/https/slapos\.vifib\.com:443/erp5/web_site_module/commercial/VirtualHostRoot(/|$|\?)'
+slapos.vifib.com /VirtualHostBase/https/slapos\.vifib\.com:443/erp5/web_site_module/commercial/VirtualHostRoot(/|$|\?)
'+www.slapos.org' '/VirtualHostBase/https/www\.slapos\.org:443/erp5/web_site_module/hosting/VirtualHostRoot(/|$|\?)'
+www.slapos.org /VirtualHostBase/https/www\.slapos\.org:443/erp5/web_site_module/hosting/VirtualHostRoot(/|$|\?)
erp5-base-list =
erp5-base-list =
'+vifib.erp5.net' '/VirtualHostBase/https/vifib\.erp5\.net:443/erp5/VirtualHostRoot(/|$|\?)'
+vifib.erp5.net /VirtualHostBase/https/vifib\.erp5\.net:443/erp5/VirtualHostRoot(/|$|\?)
skip-base-list =
skip-base-list =
[{{ section('cron-entry-apachedex-erp5') }}]
[{{ section('cron-entry-apachedex-erp5') }}]
...
@@ -236,6 +237,7 @@ extra-context =
...
@@ -236,6 +237,7 @@ extra-context =
key name :script-name
key name :script-name
[apachedex-{{ family_name }}-parameters]
[apachedex-{{ family_name }}-parameters]
default_parameter = zope-{{ family_name }}
apache-log-list = ${logrotate:backup}/{{ log_name }}-access.log-%(date)s.gz
apache-log-list = ${logrotate:backup}/{{ log_name }}-access.log-%(date)s.gz
base-list =
base-list =
erp5-base-list =
erp5-base-list =
...
...
This diff is collapsed.
Click to expand it.
software/slapos-master/software.cfg
View file @
68bae853
...
@@ -77,7 +77,7 @@ md5sum = f4fe085a0d1f09718a9456df2af8ff79
...
@@ -77,7 +77,7 @@ md5sum = f4fe085a0d1f09718a9456df2af8ff79
[template-balancer]
[template-balancer]
< = download-base-part
< = download-base-part
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
md5sum =
79e8f14058ca774c702ac155b3d67820
md5sum =
95f4f8f4b9cbd438a43678af05b3aaeb
[template-zope]
[template-zope]
< = download-base-part
< = download-base-part
...
...
This diff is collapsed.
Click to expand it.
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