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

Author: shital.rtcamp

.travis.yml

@@ -22,7 +22,7 @@ before_script:
 script:
   - sudo echo -e "[user]\n\tname = abc\n\temail = [email protected]" > ~/.gitconfig
   - sudo echo "Travis Banch = $TRAVIS_BRANCH"
-  - sudo apt-get install git python3-setuptools python3-dev python3-apt
+  - sudo apt-get install -y --force-yes git python3-setuptools python3-dev python3-apt
   - sudo python3 setup.py install
   - sudo ee --help
   - sudo ee stack install

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 rtCamp solutions private limited
+Copyright (c) 2015 rtCamp Solutions Private Limited
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -19,22 +19,21 @@ EasyEngine (ee) is a python tool, which makes it easy to manage your wordpress s
 - Ubuntu 12.04 & 14.04
 - Debian 7
 
-### This is Beta version. Donot Try on Production/Live servers
 
 ## Quick Start
 
 ```bash
-wget http://rt.cx/eebeta && sudo bash eebeta     # install easyengine 3.0.0-beta
+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
 ```
 
 ## Update EasyEngine
 
 
-Update Procedure For EasyEngine to version 3.0.0-beta
+Update Procedure For EasyEngine to version 3.0
 
 ```bash
-wget http://rt.cx/eebeta && sudo bash install
+wget -q http://rt.cx/ee && sudo bash ee
 ```
 
 ## More Site Creation Commands
@@ -85,8 +84,8 @@ ee site create example.com --mysql    # create example.com with php & mysql supp
 
 
 ## Useful Links
-- [Documentation] (http://rtcamp.com/easyengine/docs/)
-- [FAQ] (http://rtcamp.com/easyengine/faq/)
+- [Documentation] (http://docs.rtcamp.com/easyengine/docs/)
+- [FAQ] (http://docs.rtcamp.com/easyengine/faq/)
 - [Conventions used] (http://rtcamp.com/wordpress-nginx/tutorials/conventions/)
 
 ## Donations

config/ee.conf

@@ -40,22 +40,30 @@ max_files = 7
 
 [stack]
 
-ip-address = 0.0.0.0/0 1.1.1.1 2.2.2.2
+### IP address that will be used in Nginx configurations while installing
+ip-address = 127.0.0.1
 
 [mysql]
 
+### MySQL database grant host name
 grant-host = localhost
 
+### Ask for MySQL db name while site creation
 db-name = False
 
+### Ask for MySQL user name while site creation
 db-user = False
 
 [wordpress]
 
+### Ask for WordPress prefix while site creation
 prefix = False
 
+### User name for WordPress sites
 user =
 
+### Password for WordPress sites
 password =
 
+### EMail for WordPress sites
 email =

docs/README.md

@@ -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:

docs/cs.md

@@ -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,

docs/ds.md

@@ -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))