Merge branch 'master' into stable

Author: gau1991

CHANGELOG.txt

@@ -1,3 +1,7 @@
+v 3.0.1 - Feb 12,2015
+- Fixed #411, #40, #409
+- Improved installation script
+
 v 3.0.0 - Feb 11,2015
 - Refactored complete code in Python 3
 - Updated WP-CLI to 0.18

README.md

@@ -24,7 +24,7 @@ EasyEngine (ee) is a python tool, which makes it easy to manage your wordpress s
 
 ```bash
 wget -q http://rt.cx/ee && sudo bash ee     # install easyengine 3.0.0-beta
-sudo ee site create example.com --wp     # Install required packages & setup WordPress on example.com
+sudo ee site create example.com --wp        # Install required packages & setup WordPress on example.com
 ```
 
 ## Update EasyEngine
@@ -84,8 +84,8 @@ ee site create example.com --mysql    # create example.com with php & mysql supp
 
 
 ## Useful Links
-- [Documentation] (http://docs.rtcamp.com/easyengine/docs/)
-- [FAQ] (http://docs.rtcamp.com/easyengine/faq/)
+- [Documentation] (http://docs.rtcamp.com/easyengine/)
+- [FAQ] (http://docs.rtcamp.com/easyengine/faq.html)
 - [Conventions used] (http://rtcamp.com/wordpress-nginx/tutorials/conventions/)
 
 ## Donations

ee/cli/main.py

@@ -94,6 +94,9 @@ def main():
         # Default Cement signals are SIGINT and SIGTERM, exit 0 (non-error)
         code = 0
         print(e)
+    except Exception as e:
+        code = 1
+        print(e)
     finally:
         # Print an exception (if it occurred) and --debug was passed
         if app.debug:

ee/cli/plugins/debug.py

@@ -63,7 +63,7 @@ def debug_nginx(self):
                 debug_address = ['0.0.0.0/0']
             for ip_addr in debug_address:
                 if not ("debug_connection "+ip_addr in open('/etc/nginx/'
-                   'nginx.conf').read()):
+                   'nginx.conf', encoding='utf-8').read()):
                     Log.info(self, "Setting up Nginx debug connection"
                              " for "+ip_addr)
                     EEShellExec.cmd_exec(self, "sed -i \"/events {{/a\\ \\ \\ "
@@ -79,7 +79,8 @@ def debug_nginx(self):
 
         # stop global debug
         elif not self.start and not self.app.pargs.site_name:
-            if "debug_connection " in open('/etc/nginx/nginx.conf').read():
+            if "debug_connection " in open('/etc/nginx/nginx.conf',
+                                           encoding='utf-8').read():
                 Log.info(self, "Disabling Nginx debug connections")
                 EEShellExec.cmd_exec(self, "sed -i \"/debug_connection.*/d\""
                                      " /etc/nginx/nginx.conf")
@@ -146,7 +147,8 @@ def debug_php(self):
                 data = dict(php="9001", debug="9001")
                 Log.info(self, 'Writting the Nginx debug configration to file '
                          '/etc/nginx/conf.d/upstream.conf ')
-                ee_nginx = open('/etc/nginx/conf.d/upstream.conf', 'w')
+                ee_nginx = open('/etc/nginx/conf.d/upstream.conf',
+                                encoding='utf-8', mode='w')
                 self.app.render((data), 'upstream.mustache', out=ee_nginx)
                 ee_nginx.close()
                 self.trigger_php = True
@@ -165,7 +167,8 @@ def debug_php(self):
                 data = dict(php="9000", debug="9001")
                 Log.debug(self, 'Writting the Nginx debug configration to file'
                           ' /etc/nginx/conf.d/upstream.conf ')
-                ee_nginx = open('/etc/nginx/conf.d/upstream.conf', 'w')
+                ee_nginx = open('/etc/nginx/conf.d/upstream.conf',
+                                encoding='utf-8', mode='w')
                 self.app.render((data), 'upstream.mustache', out=ee_nginx)
                 ee_nginx.close()
                 self.trigger_php = True
@@ -186,7 +189,8 @@ def debug_fpm(self):
                 config.remove_option('global', 'include')
                 config['global']['log_level'] = 'debug'
                 config['global']['include'] = '/etc/php5/fpm/pool.d/*.conf'
-                with open('/etc/php5/fpm/php-fpm.conf', 'w') as configfile:
+                with open('/etc/php5/fpm/php-fpm.conf',
+                          encoding='utf-8', mode='w') as configfile:
                     Log.debug(self, "Writting php5-FPM configuration into "
                               "/etc/php5/fpm/php-fpm.conf")
                     config.write(configfile)
@@ -206,7 +210,8 @@ def debug_fpm(self):
                 config.remove_option('global', 'include')
                 config['global']['log_level'] = 'notice'
                 config['global']['include'] = '/etc/php5/fpm/pool.d/*.conf'
-                with open('/etc/php5/fpm/php-fpm.conf', 'w') as configfile:
+                with open('/etc/php5/fpm/php-fpm.conf',
+                          encoding='utf-8', mode='w') as configfile:
                     Log.debug(self, "writting php5 configuration into "
                               "/etc/php5/fpm/php-fpm.conf")
                     config.write(configfile)
@@ -278,7 +283,7 @@ def debug_wp(self):
                                             " grep true".format(wp_config)):
                     Log.info(self, "Starting WordPress debug")
                     open("{0}/htdocs/wp-content/debug.log".format(webroot),
-                         'a').close()
+                         encoding='utf-8', mode='a').close()
                     EEShellExec.cmd_exec(self, "chown {1}: {0}/htdocs/wp-"
                                          "content/debug.log"
                                          "".format(webroot,

ee/cli/plugins/secure.py

@@ -60,18 +60,23 @@ def secure_auth(self):
             self.app.pargs.user_pass = password
             if password == "":
                 self.app.pargs.user_pass = passwd
+        Log.debug(self, "printf username:"
+                  "$(openssl passwd -crypt "
+                  "password 2> /dev/null)\n\""
+                  "> /etc/nginx/htpasswd-ee 2>/dev/null")
         EEShellExec.cmd_exec(self, "printf \"{username}:"
                              "$(openssl passwd -crypt "
                              "{password} 2> /dev/null)\n\""
                              "> /etc/nginx/htpasswd-ee 2>/dev/null"
                              .format(username=self.app.pargs.user_input,
-                                     password=self.app.pargs.user_pass))
+                                     password=self.app.pargs.user_pass),
+                             log=False)
         Log.info(self, "Successfully changed HTTP authentication"
                        " username to : {username}"
-                       .format(username=self.app.pargs.user_input))
+                       .format(username=self.app.pargs.user_input), log=False)
         Log.info(self, "Successfully changed HTTP authentication"
                        " password to : {password}"
-                       .format(password=self.app.pargs.user_pass))
+                       .format(password=self.app.pargs.user_pass), log=False)
 
     @expose(hide=True)
     def secure_port(self):
@@ -92,12 +97,12 @@ def secure_port(self):
         if EEVariables.ee_platform_distro == 'Ubuntu':
             EEShellExec.cmd_exec(self, "sed -i \"s/listen.*/listen "
                                  "{port} default_server ssl spdy;/\" "
-                                 "/etc/nginx/sites-available/22222.conf"
+                                 "/etc/nginx/sites-available/22222"
                                  .format(port=self.app.pargs.user_input))
         if EEVariables.ee_platform_distro == 'debian':
             EEShellExec.cmd_exec(self, "sed -i \"s/listen.*/listen "
                                  "{port} default_server ssl;/\" "
-                                 "/etc/nginx/sites-available/22222.conf"
+                                 "/etc/nginx/sites-available/22222"
                                  .format(port=self.app.pargs.user_input))
         Log.info(self, "Successfully port changed {port}"
                  .format(port=self.app.pargs.user_input))

ee/cli/plugins/site.py

@@ -47,12 +47,14 @@ def enable(self):
                                         .format(ee_domain),
                                         '/etc/nginx/sites-enabled/{0}'
                                         .format(ee_domain)])
-
+            EEGit.add(self, ["/etc/nginx"],
+                      msg="Enabled {0} "
+                      .format(ee_domain))
             updateSiteInfo(self, ee_domain, enabled=True)
             Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]")
             EEService.reload_service(self, 'nginx')
         else:
-            Log.error(self, " site {0} does not exists".format(ee_domain))
+            Log.error(self, "\nsite {0} does not exists".format(ee_domain))
 
     @expose(help="Disable site example.com")
     def disable(self):
@@ -62,12 +64,15 @@ def disable(self):
                           .format(ee_domain)):
             if not os.path.isfile('/etc/nginx/sites-enabled/{0}'
                                   .format(ee_domain)):
-                Log.debug(self, "Site {0} already disabled" + ee_domain)
+                Log.debug(self, "Site {0} already disabled".format(ee_domain))
                 Log.info(self, "[" + Log.FAIL + "Failed" + Log.OKBLUE+"]")
             else:
                 EEFileUtils.remove_symlink(self,
                                            '/etc/nginx/sites-enabled/{0}'
                                            .format(ee_domain))
+                EEGit.add(self, ["/etc/nginx"],
+                          msg="Disabled {0} "
+                          .format(ee_domain))
                 updateSiteInfo(self, ee_domain, enabled=False)
                 Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]")
                 EEService.reload_service(self, 'nginx')
@@ -152,7 +157,8 @@ def show(self):
                           .format(ee_domain)):
             Log.info(self, "Display NGINX configuration for {0}"
                      .format(ee_domain))
-            f = open('/etc/nginx/sites-available/{0}'.format(ee_domain), "r")
+            f = open('/etc/nginx/sites-available/{0}'.format(ee_domain),
+                     encoding='utf-8', mode='r')
             text = f.read()
             Log.info(self, Log.ENDC + text)
             f.close()
@@ -436,7 +442,7 @@ def default(self):
             data = setupdatabase(self, data)
             try:
                 eedbconfig = open("{0}/ee-config.php".format(ee_site_webroot),
-                                  'w')
+                                  encoding='utf-8', mode='w')
                 eedbconfig.write("<?php \ndefine('DB_NAME', '{0}');"
                                  "\ndefine('DB_USER', '{1}'); "
                                  "\ndefine('DB_PASSWORD', '{2}');"
@@ -469,9 +475,9 @@ def default(self):
 
         if data['wp']:
             Log.info(self, Log.ENDC + "WordPress admin user :"
-                     " {0}".format(ee_wp_creds['wp_user']))
+                     " {0}".format(ee_wp_creds['wp_user']), log=False)
             Log.info(self, Log.ENDC + "WordPress admin user password : {0}"
-                     .format(ee_wp_creds['wp_pass']))
+                     .format(ee_wp_creds['wp_pass']), log=False)
 
         display_cache_settings(self, data)
         addNewSite(self, ee_www_domain, stype, cache, ee_site_webroot)
@@ -851,7 +857,7 @@ def default(self):
             data = setupdatabase(self, data)
             try:
                 eedbconfig = open("{0}/ee-config.php".format(ee_site_webroot),
-                                  'w')
+                                  encoding='utf-8', mode='w')
                 eedbconfig.write("<?php \ndefine('DB_NAME', '{0}');"
                                  "\ndefine('DB_USER', '{1}'); "
                                  "\ndefine('DB_PASSWORD', '{2}');"
@@ -934,7 +940,7 @@ class Meta:
         label = 'delete'
         stacked_on = 'site'
         stacked_type = 'nested'
-        description = 'To delete website'
+        description = 'delete an existing website'
         arguments = [
             (['site_name'],
                 dict(help='domain name to be deleted')),
@@ -950,6 +956,7 @@ class Meta:
             ]
 
     @expose(help="Delete website configuration and files")
+    @expose(hide=True)
     def default(self):
         # TODO Write code for ee site update here
         (ee_domain, ee_www_domain) = ValidateDomain(self.app.pargs.site_name)
@@ -1011,7 +1018,11 @@ def default(self):
                     Log.debug(self, "Removing Nginx configuration")
                     EEFileUtils.rm(self, '/etc/nginx/sites-available/{0}'
                                    .format(ee_domain))
+                    EEGit.add(self, ["/etc/nginx"],
+                              msg="Deleted {0} "
+                              .format(ee_domain))
                 deleteSiteInfo(self, ee_domain)
+
             Log.info(self, "Deleted site {0}".format(ee_domain))
         else:
             Log.error(self, " site {0} does not exists".format(ee_domain))

ee/cli/plugins/site_functions.py

@@ -22,7 +22,8 @@ def setupdomain(self, data):
     # write nginx config for file
     try:
         ee_site_nginx_conf = open('/etc/nginx/sites-available/{0}'
-                                  .format(ee_domain_name), 'w')
+                                  .format(ee_domain_name), encoding='utf-8',
+                                  mode='w')
 
         self.app.render((data), 'virtualconf.mustache',
                         out=ee_site_nginx_conf)
@@ -112,20 +113,24 @@ def setupdatabase(self, data):
     Log.info(self, "Setting up database\t\t", end='')
     Log.debug(self, "Creating databse {0}".format(ee_db_name))
     EEMysql.execute(self, "create database {0}"
-                    .format(ee_db_name))
+                    .format(ee_db_name), errormsg="Cannot create database")
 
     # Create MySQL User
     Log.debug(self, "Creating user {0}".format(ee_db_username))
+    Log.debug(self, "create user {0}@{1} identified by ''"
+              .format(ee_db_username, ee_mysql_grant_host))
     EEMysql.execute(self,
                     "create user {0}@{1} identified by '{2}'"
                     .format(ee_db_username, ee_mysql_grant_host,
-                            ee_db_password))
+                            ee_db_password),
+                    errormsg="Cannot setup database user", log=False)
 
     # Grant permission
     Log.debug(self, "Setting up user privileges")
     EEMysql.execute(self,
                     "grant all privileges on {0}.* to {1}@{2}"
-                    .format(ee_db_name, ee_db_username, ee_mysql_grant_host))
+                    .format(ee_db_name, ee_db_username, ee_mysql_grant_host),
+                    errormsg="Cannot setup database user privileges")
     Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]")
 
     data['ee_db_name'] = ee_db_name
@@ -442,7 +447,12 @@ def updatewpuserpassword(self, ee_domain, ee_site_webroot):
         Log.error(self, "{0} does not seem to be a WordPress site"
                   .format(ee_domain))
 
-    ee_wp_user = input("Provide WordPress user name [admin]: ")
+    try:
+        ee_wp_user = input("Provide WordPress user name [admin]: ")
+    except Exception as e:
+        Log.debug(self, "{0}".format(e))
+        Log.error(self, "\nCould not update password")
+
     if ee_wp_user == "?":
         Log.info(self, "Fetching WordPress user list")
         EEShellExec.cmd_exec(self, "wp --allow-root user list "
@@ -457,8 +467,14 @@ def updatewpuserpassword(self, ee_domain, ee_site_webroot):
                                          .format(ee_wp_user))
 
     if is_user_exist:
-        ee_wp_pass = input("Provide password for {0} user: "
-                           .format(ee_wp_user))
+        try:
+            ee_wp_pass = getpass.getpass(prompt="Provide password for "
+                                         "{0} user: "
+                                         .format(ee_wp_user))
+        except Exception as e:
+            Log.debug(self, "{0}".format(e))
+            Log.error(self, "Could not update password")
+
         if len(ee_wp_pass) > 8:
             EEShellExec.cmd_exec(self, "wp --allow-root user update {0}"
                                  "  --user_pass={1}"