moved sections, comments

stack/lapp/apache/instance-apache-php.cfg.in

@@ -107,28 +107,6 @@ logrotate-entries = $${directory:logrotate-entries}
 backup = $${directory:logrotate-backup}
 state-file = $${rootdirectory:srv}/logrotate.status
 
-[logrotate-entry-apache]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = apache
-log = $${apache-php:error-log} $${apache-php:access-log}
-frequency = daily
-rotate-num = 30
-sharedscripts = true
-notifempty = true
-create = true
-
-[logrotate-entry-stunnel]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = stunnel
-log = $${stunnel:log-file}
-frequency = daily
-rotate-num = 30
-notifempty = true
-create = true
-post = $${stunnel:post-rotate-script}
-
 
 #----------------
 #--
@@ -150,6 +128,17 @@ pid-file = $${basedirectory:run}/stunnel.pid
 wrapper = $${rootdirectory:bin}/raw_stunnel
 post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
 
+[logrotate-entry-stunnel]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = stunnel
+log = $${stunnel:log-file}
+frequency = daily
+rotate-num = 30
+notifempty = true
+create = true
+post = $${stunnel:post-rotate-script}
+
 
 #----------------
 #--
@@ -226,6 +215,17 @@ mysql-database = $${postgres-urlparse:path}
 mysql-host = $${stunnel:local-host}
 mysql-port = $${stunnel:local-port}
 
+[logrotate-entry-apache]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = apache
+log = $${apache-php:error-log} $${apache-php:access-log}
+frequency = daily
+rotate-num = 30
+sharedscripts = true
+notifempty = true
+create = true
+
 
 #----------------
 #--

stack/lapp/buildout.cfg

@@ -20,14 +20,6 @@ extends =
   ../slapos.cfg
 
 
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  ${psycopg2:egg}
-  slapos.toolbox
-  cns.recipe.symlink
-
 
 #----------------
 #-- Application-specific part (maarch, etc.)
@@ -42,35 +34,26 @@ strip-top-level-dir = true
 
 [template]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-output = ${buildout:directory}/template.cfg
+url = ${:_profile_base_location_}/instance.cfg.in
+output = ${buildout:directory}/instance.cfg
 md5sum = fad4fe349039b9bac5f95322af1b8f5a
 mode = 0644
 
 [template-apache-php]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
-output = ${buildout:directory}/template-apache-php.cfg
-md5sum = a21a91aae8bf693c2ab189969ffacaac
+output = ${buildout:directory}/instance-apache-php.cfg
+md5sum = fb34918c73ba242ffc08dfd7745367b3
 mode = 0644
 
 [template-postgres]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/postgres/instance-postgres.cfg.in
-output = ${buildout:directory}/template-postgres.cfg
-md5sum = b1f8fefaa8df0914df10f7b52b816886
+output = ${buildout:directory}/instance-postgres.cfg
+md5sum = 1dd96699e54575d8787295a4c29f1ddb
 mode = 0644
 
 
-#----------------
-#-- Dummy parts in case no application configuration file is needed
-
-[application-template]
-filename =
-location =
-
-[application-configuration]
-location =
 
 
 #----------------
@@ -107,4 +90,22 @@ path =
 part-list =
 
 #----------------
+#-- Dummy parts in case no application configuration file is needed
+
+[application-template]
+filename =
+location =
+
+[application-configuration]
+location =
+
+#----------------
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  ${psycopg2:egg}
+  slapos.toolbox
+  cns.recipe.symlink
 

stack/lapp/postgres/instance-postgres.cfg.in

@@ -40,7 +40,7 @@ cronstamps = $${rootdirectory:etc}/cronstamps
 
 #----------------
 #--
-#-- Deploy cron and configure it.
+#-- Deploy cron.
 
 [cron]
 recipe = slapos.cookbook:cron