Merge branch 'python' of github.com:rtCamp/easyengine into python

ee/cli/plugins/stack.py

@@ -78,6 +78,9 @@ class EEStackController(CementBaseController):
             else:
                 EERepo.add(repo_url=EEVariables.ee_mysql_repo)
 
+        if set(EEVariables.ee_php).issubset(set(apt_packages)):
+            print("Adding repository for php ... ")
+
     @expose(hide=True)
     def post_pref(self, apt_packages, packages):
         if len(apt_packages):
@@ -181,6 +184,7 @@ class EEStackController(CementBaseController):
 
         self.pre_pref(apt_packages)
         if len(apt_packages):
+            pkg.update()
             pkg.install(apt_packages)
         if len(packages):
             EEDownload.download(packages)

ee/core/variables.py

@@ -20,13 +20,20 @@ class EEVariables():
     ee_nginx = ["nginx-custom"]
 
     # PHP repo and packages
-    ee_php_repo = "ppa:ondrej/php5"
+    if ee_platform_distro == 'Ubuntu':
+        ee_php_repo = "ppa:ondrej/php5"
+    elif ee_platform_codename == 'squeeze':
+        ee_php_repo = ("deb http://packages.dotdeb.org {codename}-php54 all"
+                       .format(codename=ee_platform_codename))
+    elif ee_platform_codename == 'wheezy':
+        ee_php_repo = ("deb http://packages.dotdeb.org {codename}-php55 all"
+                       .format(codename=ee_platform_codename))
     ee_php = ["php5-curl", "php5-gd", "php5-cli", "php5-fpm", "php5-imap",
               "php5-mcrypt", "php5-xdebug"]
 
     # MySQL repo and packages
     ee_mysql_repo = ""
-    ee_mysql = ["mysql-server-5.6"]
+    ee_mysql = ["percona-server-server-5.6"]
 
     # Postfix repo and packages
     ee_postfix_repo = ""