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

Proposed by james beedy on 2016-06-17
Status: Merged
Merged at revision: 87
Proposed branch: lp:~jamesbeedy/charms/trusty/wordpress/apache2_trusty_fix
Merge into: lp:charms/trusty/wordpress
Diff against target: 44 lines (+17/-1)
2 files modified
files/charm/apache/etc_apache2_conf-d_php5-fpm.conf (+4/-0)
hooks/config-changed (+13/-1)
To merge this branch: bzr merge lp:~jamesbeedy/charms/trusty/wordpress/apache2_trusty_fix
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Approve on 2016-09-11
Pete Vander Giessen (community) Approve on 2016-07-14
Marco Ceppi 2016-06-17 Pending
charmers 2016-06-17 Pending
Review via email: mp+297720@code.launchpad.net

Description of the change

Modified to include support for > precise.

Fixes Bug #1593498

To post a comment you must log in.
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) wrote :

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) wrote :

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

Kevin W Monroe (kwmonroe) wrote :

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

Review Queue (review-queue) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'files/charm/apache/etc_apache2_conf-d_php5-fpm.conf'
2--- files/charm/apache/etc_apache2_conf-d_php5-fpm.conf 2012-11-21 20:12:24 +0000
3+++ files/charm/apache/etc_apache2_conf-d_php5-fpm.conf 2016-06-17 03:22:30 +0000
4@@ -3,4 +3,8 @@
5 Action php5-fcgi /php5-fcgi
6 Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
7 FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket /var/run/php5-fpm.sock -pass-header Authorization
8+
9+ <Directory /usr/lib/cgi-bin>
10+ Require all granted
11+ </Directory>
12 </IfModule>
13
14=== modified file 'hooks/config-changed'
15--- hooks/config-changed 2014-10-29 13:10:45 +0000
16+++ hooks/config-changed 2016-06-17 03:22:30 +0000
17@@ -3,6 +3,7 @@
18 set -ue
19
20 source inc/common
21+source /etc/lsb-release
22
23 ##
24 # This is where things can get a bit hectic. So this long blog is just to
25@@ -65,7 +66,18 @@
26 rm -f /etc/apache2/sites-enabled/*
27 a2enmod actions fastcgi alias proxy_balancer proxy_http headers
28
29- install -o root -g root -m 0644 files/charm/apache/etc_apache2_conf-d_php5-fpm.conf /etc/apache2/conf.d/php5-fpm.conf
30+ if ["$DISTRIB_CODENAME" == "precise" ]; then
31+ install -o root -g root -m 0644 files/charm/apache/etc_apache2_conf-d_php5-fpm.conf /etc/apache2/conf.d/php5-fpm.conf
32+ else
33+ install -o root -g root -m 0644 files/charm/apache/etc_apache2_conf-d_php5-fpm.conf /etc/apache2/conf-available/php5-fpm.conf
34+
35+ # Check for symlink pre-exist
36+ if [ -h /etc/apache2/conf-enabled/php5-fpm.conf ]; then
37+ echo "Symlink pre-exists"
38+ else
39+ ln -s /etc/apache2/conf-available/php5-fpm.conf /etc/apache2/conf-enabled/php5-fpm.conf
40+ fi
41+ fi
42
43 juju-log "Installing Apache loadbal config..."
44 install -o root -g root -m 0644 files/charm/apache/etc_apache2_sites-enabled_loadbalancer /etc/apache2/sites-available/loadbalancer.conf

Subscribers

People subscribed via source and target branches

to all changes: