Merge lp:~afroyd/charms/trusty/zend-server/zend-server-8-GA into lp:charms/trusty/zend-server

[afroyd]

Changing the installation source from the Beta version to the newly released GA version

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10689-results

review: Needs Fixing (automated testing)

[José Antonio Rey (jose)]

Hello, Amir!

Thank you for proposing this fix for the Zend Server charm. Turns out I ran automated testing on my end (EC2) and it passes with no errors!

I will be merging this in a couple minutes since it looks sane enough and the deployment works as expected. Thanks again for the fix!

review: Approve

=== added file 'files/ZendServer-8.0.0-RepositoryInstaller-linux.tar.gz'
Binary files files/ZendServer-8.0.0-RepositoryInstaller-linux.tar.gz	1970-01-01 00:00:00 +0000 and files/ZendServer-8.0.0-RepositoryInstaller-linux.tar.gz	2014-12-11 12:33:01 +0000 differ
=== removed file 'files/repo_installer_beta.tar.gz'
Binary files files/repo_installer_beta.tar.gz	2014-11-12 22:26:14 +0000 and files/repo_installer_beta.tar.gz	1970-01-01 00:00:00 +0000 differ
=== removed file 'files/repo_installer_early_access.tar.gz'
Binary files files/repo_installer_early_access.tar.gz	2014-11-12 22:26:14 +0000 and files/repo_installer_early_access.tar.gz	1970-01-01 00:00:00 +0000 differ
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-11-12 22:26:14 +0000
+++ hooks/config-changed	2014-12-11 12:33:01 +0000
@@ -9,7 +9,7 @@
 production="true"
 private_address=`ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1  -d'/'`
 if  [ "$ZS_installed" = "false" ]; then
-	./install_zs.sh $phpVersion --automatic
+	./ZendServer-RepositoryInstaller-linux/install_zs.sh $phpVersion --automatic
 	juju-log "Zend Server installed. Will now proceed to bootstrap if api key hash is available"
 	echo "ZS_installed=true" >> ~/.ZendServerStatus
 fi

=== modified file 'hooks/install'
--- hooks/install	2014-11-12 22:26:14 +0000
+++ hooks/install	2014-12-11 12:33:01 +0000
@@ -1,5 +1,4 @@
 #!/bin/bash
 set -ex # If any command fails, stop execution of the hook with that error
 echo "ZS_installed=false" >> ~/.ZendServerStatus
-#tar xzf files/repo_installer_early_access.tar.gz
-tar xzf files/repo_installer_beta.tar.gz
+tar xzf files/ZendServer-8.0.0-RepositoryInstaller-linux.tar.gz