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

ee/cli/plugins/secure.py

@@ -92,12 +92,12 @@ class EESecureController(CementBaseController):
         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/stack.py

@@ -278,8 +278,8 @@ class EEStackController(CementBaseController):
                     # 22222 port settings
                     Log.debug(self, 'Writting the nginx configuration to '
                               'file /etc/nginx/sites-available/'
-                              '22222.conf')
-                    ee_nginx = open('/etc/nginx/sites-available/22222.conf',
+                              '22222')
+                    ee_nginx = open('/etc/nginx/sites-available/22222',
                                     encoding='utf-8', mode='w')
                     self.app.render((data), '22222.mustache',
                                     out=ee_nginx)
@@ -297,10 +297,10 @@ class EEStackController(CementBaseController):
                     # Create Symbolic link for 22222
                     EEFileUtils.create_symlink(self, ['/etc/nginx/'
                                                       'sites-available/'
-                                                      '22222.conf',
+                                                      '22222',
                                                       '/etc/nginx/'
                                                       'sites-enabled/'
-                                                      '22222.conf'])
+                                                      '22222'])
                     # Create log and cert folder and softlinks
                     if not os.path.exists('{0}22222/logs'
                                           .format(EEVariables.ee_webroot)):
@@ -503,7 +503,7 @@ class EEStackController(CementBaseController):
                                          "performance_schema = 0\" "
                                          "/etc/mysql/my.cnf")
 
-                EEGit.add(self, ["/etc/mysql"], msg="Adding Nginx into Git")
+                EEGit.add(self, ["/etc/mysql"], msg="Adding MySQL into Git")
                 EEService.reload_service(self, 'mysql')
 
             if set(EEVariables.ee_mail).issubset(set(apt_packages)):
@@ -1052,17 +1052,17 @@ class EEStackController(CementBaseController):
 
                 Log.debug(self, 'Writting the nginx configuration for '
                           'RoundCubemail')
-                ee_rc = open('/etc/nginx/sites-available/webmail.conf',
+                ee_rc = open('/etc/nginx/sites-available/webmail',
                              encoding='utf-8', mode='w')
                 self.app.render((data), 'virtualconf.mustache',
                                 out=ee_rc)
                 ee_rc.close()
 
-                # Create Symbolic link for webmail.conf
+                # Create Symbolic link for webmail
                 EEFileUtils.create_symlink(self, ['/etc/nginx/sites-available'
-                                                  '/webmail.conf',
+                                                  '/webmail',
                                                   '/etc/nginx/sites-enabled/'
-                                                  'webmail.conf'])
+                                                  'webmail'])
                 # Create log folder and softlinks
                 if not os.path.exists('{0}roundcubemail/logs'
                                       .format(EEVariables.ee_webroot)):
@@ -1365,7 +1365,7 @@ class EEStackController(CementBaseController):
                                    .format(EEVariables.ee_webroot)]
         if self.app.pargs.adminer:
             Log.debug(self, "Removing package variable of Adminer ")
-            packages = packages + ['{0}22222/htdocs/db/Adminer'
+            packages = packages + ['{0}22222/htdocs/db/adminer'
                                    .format(EEVariables.ee_webroot)]
         if self.app.pargs.utils:
             Log.debug(self, "Removing package variable of utils ")
@@ -1373,12 +1373,12 @@ class EEStackController(CementBaseController):
                                    .format(EEVariables.ee_webroot),
                                    '{0}22222/htdocs/cache/opcache'
                                    .format(EEVariables.ee_webroot),
-                                   '{0}22222/htdocs/cache/Nginx/'
+                                   '{0}22222/htdocs/cache/nginx/'
                                    'clean.php'.format(EEVariables.ee_webroot),
-                                   '{0}22222/htdocs/cache/Memcache'
+                                   '{0}22222/htdocs/cache/memcache'
                                    .format(EEVariables.ee_webroot),
                                    '/usr/bin/pt-query-advisor',
-                                   '{0}22222/htdocs/db/Anemometer'
+                                   '{0}22222/htdocs/db/anemometer'
                                    .format(EEVariables.ee_webroot)]
 
         if len(apt_packages):