diff --git a/software/wordpress/software.cfg b/software/wordpress/software.cfg index 4d111dc579cc8e13bbfd385c1d7ae7830ecfbe40..752714a26d774024ee3721e510957d9b56cf09b8 100644 --- a/software/wordpress/software.cfg +++ b/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 diff --git a/software/wordpress/wp-config.php.in b/software/wordpress/wp-config.php.in index c96b2d3be1084da78d3ece1c605e11a05c8c09a7..69b10723b3980b86ca5892ca12542e810281efd8 100644 --- a/software/wordpress/wp-config.php.in +++ b/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 diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index d4fe69349bdf3f67e2f3d8e37ab172202b184dfb..9c79d5109ccecc09fd53b846e02d23bf0ae63f1f 100644 --- a/stack/lamp/buildout.cfg +++ b/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] diff --git a/stack/lamp/instance-apache-php.cfg b/stack/lamp/instance-apache-php.cfg index 201062090b4ff56efa57b6240ade7d150a9f33a0..56945b4def0ac75c877ba04d1aecc999a398fa6d 100644 --- a/stack/lamp/instance-apache-php.cfg +++ b/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]