Merge branch 'wordpress'

software/wordpress/software.cfg

@@ -13,7 +13,7 @@ url = http://wordpress.org/latest.tar.gz
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/wp-config.php.in
-md5sum = ${application-configuration:md5sum}
+md5sum = 0d62b28125ca3c780db0b547199953f2
 download-only = True
 filename = template.in
 mode = 0644
@@ -21,7 +21,6 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [application-configuration]
 location = wp-config.php
-md5sum = 3859841a4ad6ed23744d6bc5a01321e0
   
 [versions]
 # Use SlapOS patched zc.buildout

software/wordpress/wp-config.php.in

@@ -88,3 +88,5 @@ if ( !defined('ABSPATH') )
 
 /** Sets up WordPress vars and included files. */
 require_once(ABSPATH . 'wp-settings.php');
+
+remove_action( 'template_redirect', 'redirect_canonical' );
\ No newline at end of file

stack/lamp/buildout.cfg

@@ -69,7 +69,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-php.cfg
 output = ${buildout:directory}/template-apache-php.cfg
-md5sum = b98e76abcf091ea0aee20d1ac59bb877
+md5sum = f8a1599f19a67d948f4a1f32f3bd3e2f
 mode = 0644
 
 [template-apache-backup]

stack/lamp/instance-apache-php.cfg

@@ -9,9 +9,8 @@ parts =
   cron
   cron-entry-logrotate
   promise
-  publish-backend-connection-informations
   frontend-promise
-  publish-frontend-connection-informations
+  publish-connection-informations
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -29,12 +28,9 @@ path = $${basedirectory:promises}/frontend
 url = $${request-frontend:connection-site_url}
 dash_path = ${dash:location}/bin/dash
 
-[publish-backend-connection-informations]
+[publish-connection-informations]
 recipe = slapos.cookbook:publish
 backend_url = $${apache-php:url}
-
-[publish-frontend-connection-informations]
-<= publish-backend-connection-informations
 url = $${request-frontend:connection-site_url}
 
 [mariadb-urlparse]