davstorage: Switching instance to offline mode compliance

software/davstorage/common.cfg

@@ -43,6 +43,12 @@ parts =
   application
   template
   bootstrap-conf
+  mailer-plugin-template
+  share-url-generation-template
+  postfix-service-template
+  sendmail-script-template
+  postfix-conf-template
+  postfix-master-conf-template
   lxml-python
   eggs
   instance-recipe-egg
@@ -79,7 +85,7 @@ mode = 0644
 [instance-davstorage]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-davstorage.cfg
-md5sum = 0dc988d8f9ade52e83e3092fa7943dbb
+md5sum = 7f3be7bf2b4de1624b990846c5712c44
 output = ${buildout:directory}/template-davstorage.cfg
 mode = 0644
 
@@ -92,5 +98,53 @@ output = ${application:location}/conf/${:filename}
 mode = 0644
 md5sum = f8bbf14507f9c22d7b69696345e57c2e
 
+[mailer-plugin-template]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/templates/${:filename}
+filename = class.phpmailer-lite.php
+download-only = true
+mode = 0644
+md5sum = 4649b152e1f639873a03149eccc70aaf
+
+[share-url-generation-template]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/templates/${:filename}
+filename = class.AJXP_Utils.php
+download-only = true
+mode = 0644
+md5sum = f681c0a0a17f4b2a0896b952e53239ed
+
+[postfix-service-template]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/templates/${:filename}
+filename = postfix.in
+download-only = true
+mode = 0755
+md5sum = 94799688bf95fb16b86972a23df13af2
+
+[sendmail-script-template]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/templates/${:filename}
+filename = sendmail.in
+download-only = true
+mode = 0755
+md5sum = d2ea9ecfd653dcb0bd06c06bcaabc5df
+
+[postfix-conf-template]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/templates/${:filename}
+filename = main.cf.in
+download-only = true
+mode = 0644
+md5sum = a72b679c523f587422f95d295de27876
+
+[postfix-master-conf-template]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/templates/${:filename}
+filename = master.cf.in
+download-only = true
+mode = 0644
+md5sum = de33aa9ef530ef3c7661b914d2d1fbef
+
 [lxml-python]
 python = python2.7

software/davstorage/instance-davstorage.cfg

@@ -59,6 +59,7 @@ apache-binary = ${apache:location}/bin/httpd
 apache-modules-dir = ${apache:location}/modules/
 apache-mime-file = ${apache:location}/conf/mime.types
 apache-htpasswd = ${apache:location}/bin/htpasswd
+source = ${application:location}
 
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
@@ -213,25 +214,23 @@ command = cp -R ${application:location}/* $${directory:htdocs}
 
 [mailer-plugin]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/templates/$${:filename}
-filename = class.phpmailer-lite.php
+url = ${mailer-plugin-template:location}/${mailer-plugin-template:filename}
 sendmail-script = $${sendmail-script:output}
-output = $${directory:htdocs}/plugins/mailer.phpmailer-lite/lib/$${:filename}
+output = $${directory:htdocs}/plugins/mailer.phpmailer-lite/lib/${mailer-plugin-template:filename}
 mode = 0644
 md5sum = 4649b152e1f639873a03149eccc70aaf
 
 [share-url-generation]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/templates/$${:filename}
+url = ${share-url-generation-template:location}/${share-url-generation-template:filename}
 filename = class.AJXP_Utils.php
-output = $${directory:htdocs}/core/classes/$${:filename}
+output = $${directory:htdocs}/core/classes/${share-url-generation-template:filename}
 mode = 0644
 md5sum = f681c0a0a17f4b2a0896b952e53239ed
 
 [postfix-service]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/templates/$${:filename}
-filename = postfix.in
+url = ${postfix-service-template:location}/${postfix-service-template:filename}
 postfix-location = ${postfix:location}/usr/sbin/postfix
 postfix-config-dir = $${directory:postfix-conf}
 output = $${basedirectory:services}/postfix
@@ -240,8 +239,7 @@ md5sum = 94799688bf95fb16b86972a23df13af2
 
 [sendmail-script]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/templates/$${:filename}
-filename = sendmail.in
+url = ${sendmail-script-template:location}/${sendmail-script-template:filename}
 sendmail-location = ${postfix:location}/usr/sbin/sendmail
 postfix-config-dir = $${directory:postfix-conf}
 output = $${rootdirectory:bin}/sendmail
@@ -250,8 +248,7 @@ md5sum = d2ea9ecfd653dcb0bd06c06bcaabc5df
 
 [postfix-conf]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/templates/$${:filename}
-filename = main.cf.in
+url = ${postfix-conf-template:location}/${postfix-conf-template:filename}
 queue-directory = $${directory:spool}
 command-directory = ${postfix:location}/usr/sbin
 bin-directory =  ${postfix:location}/usr/bin
@@ -271,8 +268,7 @@ command = sed 's/ slappart/ slapuser/g' $${postfix-conf:output} > main.tmp && mv
 
 [postfix-master-conf]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/templates/$${:filename}
-filename = master.cf.in
+url = ${postfix-master-conf-template:location}/${postfix-master-conf-template:filename}
 port = 2525
 output = $${directory:postfix-conf}/master.cf
 mode = 0644