Fix export/import for apache.

parent 2cb09c4a
...@@ -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]
......
...@@ -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?
[exporter] [importer]
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]
......
...@@ -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]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment