diff --git a/stack/lamp/apache/instance-apache-export.cfg.jinja2 b/stack/lamp/apache/instance-apache-export.cfg.jinja2 index 359d633e98d4f72dc58ba7d1548ee59d4dba04c9..8a1af1fcf2413ad6cb5da7412465c66a6abec917 100644 --- a/stack/lamp/apache/instance-apache-export.cfg.jinja2 +++ b/stack/lamp/apache/instance-apache-export.cfg.jinja2 @@ -20,7 +20,7 @@ parts += # Nothing to do for the exporter. Just dummy part that does nothing. # For httpd instance, PBS will directly pull data from srv/www. [exporter] -wrapper = /usr/bin/true +wrapper = /bin/true # State that we want to backup srv/www directory, not srv/backup. [rdiff-backup-server] diff --git a/stack/lamp/apache/instance-apache-import.cfg.in b/stack/lamp/apache/instance-apache-import.cfg.in index ac2e882c6dd72473adb873ec412b818df9d4006a..45ae0b80abeaaa9cd6bfeb80473f72cb37df68cb 100644 --- a/stack/lamp/apache/instance-apache-import.cfg.in +++ b/stack/lamp/apache/instance-apache-import.cfg.in @@ -19,8 +19,8 @@ www = $${:srv}/www/ # Nothing to do for the import. Just dummy part that does nothing. # For httpd instance, PBS will directly push data to srv/www. # XXX-Cedric: is it safe? -[exporter] -wrapper = /usr/bin/true +[importer] +wrapper = /bin/true # XXX-Cedric: resilient uses "urls" part to publish, but apache doesn't. [urls] diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index d8b8c5ffedccf1ceb8cb0bd9377ca4bc279e8fc6..8da43ddd35ea3cad0eabc2c471dfd5509dd7a001 100644 --- a/stack/lamp/buildout.cfg +++ b/stack/lamp/buildout.cfg @@ -81,7 +81,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/apache/instance-apache-import.cfg.in output = ${buildout:directory}/instance-apache-import.cfg -md5sum = 7c5bb18f1dccb38ad043c33e224798e6 +md5sum = 4067a0d32efbfad3923f3fe5a8ce77b4 mode = 0644 [instance-apache-export] @@ -95,7 +95,7 @@ context = key templateapache instance-apache-php:output import-list = file parts template-parts:destination file replicated template-replicated:destination -md5sum = 6e544e4d6f8093fee1724b231e1e8f34 +md5sum = fb5c121e8d6ab4a23d22d2bd23b6f445 mode = 0644 [instance-resilient]