Merge lp:~jamesbeedy/charms/trusty/wordpress/apache2_trusty_fix into lp:charms/trusty/wordpress

[james beedy]

Modified to include support for > precise.

Fixes Bug #1593498

[lp:~jamesbeedy/charms/trusty/wordpress/apache2_trusty_fix]

87. By james beedy on 2016-06-17

Removed unneeded sources modifications

88. By james beedy on 2016-06-17

Add closing fi

89. By james beedy on 2016-06-17

Re-add sources sed cmd and apache2-mpm-worker

[Pete Vander Giessen (petevg)]

The code makes sense, and the charm deploys successfully and tests pass. +1

(It looks like there might be an issue with the tests when run via bundletester -- they pass, but leave the wordpress machine in a "hook failed: cache-relation-changed" for memcached:cache" state. The precise tests in trunk do the same thing, however, so I don't believe that it is related to this code, or should block this PR from being merged.)

review: Approve

[james beedy (jamesbeedy)]

@petevg thanks for the review! Yes, the cache-relation-changed fails for me to ... prior to this change.

[Kevin W Monroe (kwmonroe)]

Hey Marco, will you pull this into your namespace (or a wp-charmers group, if such a thing exists)?

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5015/

review: Approve (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4812/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5023/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5031/

review: Approve (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4819/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4824/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5038/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4828/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5042/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5045/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4832/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4835/

review: Approve (automated testing)

[Cory Johns (johnsca)]

This has been merged and released as cs:trusty/wordpress-5

=== modified file 'files/charm/apache/etc_apache2_conf-d_php5-fpm.conf'
--- files/charm/apache/etc_apache2_conf-d_php5-fpm.conf	2012-11-21 20:12:24 +0000
+++ files/charm/apache/etc_apache2_conf-d_php5-fpm.conf	2016-06-17 03:22:30 +0000
@@ -3,4 +3,8 @@
 	Action php5-fcgi /php5-fcgi
 	Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
 	FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket /var/run/php5-fpm.sock -pass-header Authorization
+
+    <Directory /usr/lib/cgi-bin>
+        Require all granted
+    </Directory>
 </IfModule>

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-10-29 13:10:45 +0000
+++ hooks/config-changed	2016-06-17 03:22:30 +0000
@@ -3,6 +3,7 @@
 set -ue
 
 source inc/common
+source /etc/lsb-release
 
 ##
 # This is where things can get a bit hectic. So this long blog is just to
@@ -65,7 +66,18 @@
 	rm -f /etc/apache2/sites-enabled/*
 	a2enmod actions fastcgi alias proxy_balancer proxy_http headers
 
-	install -o root -g root -m 0644 files/charm/apache/etc_apache2_conf-d_php5-fpm.conf /etc/apache2/conf.d/php5-fpm.conf
+        if ["$DISTRIB_CODENAME" == "precise" ]; then
+		install -o root -g root -m 0644 files/charm/apache/etc_apache2_conf-d_php5-fpm.conf /etc/apache2/conf.d/php5-fpm.conf
+        else
+		install -o root -g root -m 0644 files/charm/apache/etc_apache2_conf-d_php5-fpm.conf /etc/apache2/conf-available/php5-fpm.conf
+
+		# Check for symlink pre-exist
+                if [ -h /etc/apache2/conf-enabled/php5-fpm.conf ]; then
+			echo "Symlink pre-exists"
+		else
+			ln -s /etc/apache2/conf-available/php5-fpm.conf /etc/apache2/conf-enabled/php5-fpm.conf
+		fi
+	fi
 
 	juju-log "Installing Apache loadbal config..."
 	install -o root -g root -m 0644 files/charm/apache/etc_apache2_sites-enabled_loadbalancer /etc/apache2/sites-available/loadbalancer.conf