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
Xiaohe Cao
slapos
Commits
9da50950
Commit
9da50950
authored
Feb 20, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix export/import for apache.
parent
2cb09c4a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
stack/lamp/apache/instance-apache-export.cfg.jinja2
stack/lamp/apache/instance-apache-export.cfg.jinja2
+1
-1
stack/lamp/apache/instance-apache-import.cfg.in
stack/lamp/apache/instance-apache-import.cfg.in
+2
-2
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+2
-2
No files found.
stack/lamp/apache/instance-apache-export.cfg.jinja2
View file @
9da50950
...
@@ -20,7 +20,7 @@ parts +=
...
@@ -20,7 +20,7 @@ parts +=
# Nothing to do for the exporter. Just dummy part that does nothing.
# Nothing to do for the exporter. Just dummy part that does nothing.
# For httpd instance, PBS will directly pull data from srv/www.
# For httpd instance, PBS will directly pull data from srv/www.
[exporter]
[exporter]
wrapper = /
usr/
bin/true
wrapper = /bin/true
# State that we want to backup srv/www directory, not srv/backup.
# State that we want to backup srv/www directory, not srv/backup.
[rdiff-backup-server]
[rdiff-backup-server]
...
...
stack/lamp/apache/instance-apache-import.cfg.in
View file @
9da50950
...
@@ -19,8 +19,8 @@ www = $${:srv}/www/
...
@@ -19,8 +19,8 @@ www = $${:srv}/www/
# Nothing to do for the import. Just dummy part that does nothing.
# Nothing to do for the import. Just dummy part that does nothing.
# For httpd instance, PBS will directly push data to srv/www.
# For httpd instance, PBS will directly push data to srv/www.
# XXX-Cedric: is it safe?
# XXX-Cedric: is it safe?
[
ex
porter]
[
im
porter]
wrapper = /
usr/
bin/true
wrapper = /bin/true
# XXX-Cedric: resilient uses "urls" part to publish, but apache doesn't.
# XXX-Cedric: resilient uses "urls" part to publish, but apache doesn't.
[urls]
[urls]
...
...
stack/lamp/buildout.cfg
View file @
9da50950
...
@@ -81,7 +81,7 @@ mode = 0644
...
@@ -81,7 +81,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-import.cfg.in
url = ${:_profile_base_location_}/apache/instance-apache-import.cfg.in
output = ${buildout:directory}/instance-apache-import.cfg
output = ${buildout:directory}/instance-apache-import.cfg
md5sum =
7c5bb18f1dccb38ad043c33e224798e6
md5sum =
4067a0d32efbfad3923f3fe5a8ce77b4
mode = 0644
mode = 0644
[instance-apache-export]
[instance-apache-export]
...
@@ -95,7 +95,7 @@ context = key templateapache instance-apache-php:output
...
@@ -95,7 +95,7 @@ context = key templateapache instance-apache-php:output
import-list = file parts template-parts:destination
import-list = file parts template-parts:destination
file replicated template-replicated:destination
file replicated template-replicated:destination
md5sum =
6e544e4d6f8093fee1724b231e1e8f34
md5sum =
fb5c121e8d6ab4a23d22d2bd23b6f445
mode = 0644
mode = 0644
[instance-resilient]
[instance-resilient]
...
...
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