Merge branch 'feature/susebuilderrepo' into develop

Author: gau1991

config/bash_completion.d/ee_auto.rc

@@ -11,7 +11,7 @@ _ee_complete()
     # SETUP THE BASE LEVEL (everything after "ee")
     if [ $COMP_CWORD -eq 1 ]; then
         COMPREPLY=( $(compgen \
-                      -W "stack site debug clean secure import-slow-log log update sync" \
+                      -W "stack site debug clean secure import-slow-log log update sync info" \
                       -- $cur) )
 
 

ee/cli/plugins/debug.py

@@ -84,6 +84,11 @@ def debug_nginx(self):
                                  .split())
             except Exception as e:
                 debug_address = ['0.0.0.0/0']
+
+            # Check if IP address is 127.0.0.1 then enable debug globally
+            if debug_address == ['127.0.0.1'] or debug_address == []:
+                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', encoding='utf-8').read()):
@@ -226,7 +231,7 @@ def debug_php(self):
     def debug_fpm(self):
         """Start/Stop PHP5-FPM debug"""
         # PHP5-FPM start global debug
-        if (self.app.pargs.php == 'on'and not self.app.pargs.site_name):
+        if (self.app.pargs.fpm == 'on' and not self.app.pargs.site_name):
             if not EEShellExec.cmd_exec(self, "grep \"log_level = debug\" "
                                               "/etc/php5/fpm/php-fpm.conf"):
                 Log.info(self, "Setting up PHP5-FPM log_level = debug")
@@ -247,7 +252,7 @@ def debug_fpm(self):
             self.msg = self.msg + ['/var/log/php5/fpm.log']
 
         # PHP5-FPM stop global debug
-        elif (self.app.pargs.php == 'on' and not self.app.pargs.site_name):
+        elif (self.app.pargs.fpm == 'off' and not self.app.pargs.site_name):
             if EEShellExec.cmd_exec(self, "grep \"log_level = debug\" "
                                           "/etc/php5/fpm/php-fpm.conf"):
                 Log.info(self, "Disabling PHP5-FPM log_level = debug")

ee/cli/plugins/info.py

@@ -48,15 +48,10 @@ def info_nginx(self):
         worker_processes = nc.get('worker_processes')[1]
         worker_connections = nc.get([('events',), 'worker_connections'])[1]
         keepalive_timeout = nc.get([('http',), 'keepalive_timeout'])[1]
-        if os.path.isfile('/etc/nginx/conf.d/ee-nginx.conf'):
-            nc.loadf('/etc/nginx/conf.d/ee-nginx.conf')
-            fastcgi_read_timeout = nc.get('fastcgi_read_timeout')[1]
-            client_max_body_size = nc.get('client_max_body_size')[1]
-        else:
-            fastcgi_read_timeout = nc.get([('http',),
-                                          'fastcgi_read_timeout'])[1]
-            client_max_body_size = nc.get([('http',),
-                                          'client_max_body_size'])[1]
+        fastcgi_read_timeout = nc.get([('http',),
+                                       'fastcgi_read_timeout'])[1]
+        client_max_body_size = nc.get([('http',),
+                                       'client_max_body_size'])[1]
         data = dict(version=version, allow=allow, user=user,
                     worker_processes=worker_processes,
                     keepalive_timeout=keepalive_timeout,

ee/cli/plugins/site_functions.py

@@ -560,12 +560,7 @@ def site_package_check(self, stype):
                  'wpsubdomain']:
         Log.debug(self, "Setting apt_packages variable for Nginx")
 
-        if EEVariables.ee_platform_distro == 'debian':
-            check_nginx = 'nginx-extras'
-        else:
-            check_nginx = 'nginx-custom'
-
-        if not EEAptGet.is_installed(self, check_nginx):
+        if not EEAptGet.is_installed(self, 'nginx-custom'):
             apt_packages = apt_packages + EEVariables.ee_nginx
         else:
             # Fix for Nginx white screen death

ee/cli/plugins/stack.py

@@ -153,12 +153,9 @@ def pre_pref(self, apt_packages):
 
         if set(EEVariables.ee_nginx).issubset(set(apt_packages)):
             Log.info(self, "Adding repository for NGINX, please wait...")
-            if EEVariables.ee_platform_distro == 'debian':
-                Log.debug(self, 'Adding Dotdeb/nginx GPG key')
-                EERepo.add(self, repo_url=EEVariables.ee_nginx_repo)
-            else:
-                EERepo.add(self, ppa=EEVariables.ee_nginx_repo)
-                Log.debug(self, 'Adding ppa of Nginx')
+            EERepo.add(self, repo_url=EEVariables.ee_nginx_repo)
+            Log.debug(self, 'Adding ppa of Nginx')
+            EERepo.add_key(self, EEVariables.ee_nginx_key)
 
         if set(EEVariables.ee_php).issubset(set(apt_packages)):
             Log.info(self, "Adding repository for PHP, please wait...")
@@ -205,37 +202,16 @@ def post_pref(self, apt_packages, packages):
                 EEService.reload_service(self, 'postfix')
 
             if set(EEVariables.ee_nginx).issubset(set(apt_packages)):
-                if ((not EEShellExec.cmd_exec(self, "grep -q -Hr EasyEngine "
-                   "/etc/nginx")) and os.path.isfile('/etc/nginx/nginx.conf')):
-                    nc = NginxConfig()
-                    Log.debug(self, 'Loading file /etc/nginx/nginx.conf ')
-                    nc.loadf('/etc/nginx/nginx.conf')
-                    nc.set('worker_processes', 'auto')
-                    nc.append(('worker_rlimit_nofile', '100000'), position=2)
-                    nc.remove(('events', ''))
-                    nc.append({'name': 'events', 'param': '', 'value':
-                              [('worker_connections', '4096'),
-                               ('multi_accept', 'on')]}, position=4)
-                    nc.set([('http',), 'keepalive_timeout'], '30')
-                    Log.debug(self, "Writting nginx configuration to "
-                              "file /etc/nginx/nginx.conf ")
-                    nc.savef('/etc/nginx/nginx.conf')
-
-                    # Custom Nginx configuration by EasyEngine
-                    if EEVariables.ee_platform_distro == 'ubuntu':
-                        data = dict(version=EEVariables.ee_version,
-                                    Ubuntu=True)
-                    else:
-                        data = dict(version=EEVariables.ee_version,
-                                    Debian=True)
-                    Log.debug(self, 'Writting the nginx configuration to '
-                              'file /etc/nginx/conf.d/ee-nginx.conf ')
-                    ee_nginx = open('/etc/nginx/conf.d/ee-nginx.conf',
-                                    encoding='utf-8', mode='w')
-                    self.app.render((data), 'nginx-core.mustache',
-                                    out=ee_nginx)
-                    ee_nginx.close()
-
+                if not (os.path.isfile('/etc/nginx/common/wpfc.conf')):
+                    # Change EasyEngine Version in nginx.conf file
+                    EEFileUtils.searchreplace(self, "/etc/nginx/nginx.conf",
+                                              "# add_header",
+                                              "add_header")
+
+                    EEFileUtils.searchreplace(self, "/etc/nginx/nginx.conf",
+                                              "\"EasyEngine\"",
+                                              "\"EasyEngine {0}\""
+                                              .format(EEVariables.ee_version))
                     data = dict()
                     Log.debug(self, 'Writting the nginx configuration to '
                               'file /etc/nginx/conf.d/blockips.conf')
@@ -1475,12 +1451,7 @@ def install(self, packages=[], apt_packages=[], disp_msg=True):
             if self.app.pargs.nginx:
                 Log.debug(self, "Setting apt_packages variable for Nginx")
 
-                if EEVariables.ee_platform_distro == 'debian':
-                    check_nginx = 'nginx-extras'
-                else:
-                    check_nginx = 'nginx-custom'
-
-                if not EEAptGet.is_installed(self, check_nginx):
+                if not EEAptGet.is_installed(self, 'nginx-custom'):
                     apt_packages = apt_packages + EEVariables.ee_nginx
                 else:
                     Log.debug(self, "Nginx already installed")

ee/cli/plugins/stack_services.py

@@ -34,12 +34,7 @@ def start(self):
             self.app.pargs.hhvm = True
 
         if self.app.pargs.nginx:
-            if EEVariables.ee_platform_distro == 'debian':
-                check_nginx = 'nginx-extras'
-            else:
-                check_nginx = 'nginx-custom'
-
-            if EEAptGet.is_installed(self, check_nginx):
+            if EEAptGet.is_installed(self, 'nginx-custom'):
                 services = services + ['nginx']
             else:
                 Log.info(self, "Nginx is not installed")
@@ -105,12 +100,7 @@ def stop(self):
             self.app.pargs.hhvm = True
 
         if self.app.pargs.nginx:
-            if EEVariables.ee_platform_distro == 'debian':
-                check_nginx = 'nginx-extras'
-            else:
-                check_nginx = 'nginx-custom'
-
-            if EEAptGet.is_installed(self, check_nginx):
+            if EEAptGet.is_installed(self, 'nginx-custom'):
                 services = services + ['nginx']
             else:
                 Log.info(self, "Nginx is not installed")
@@ -176,12 +166,7 @@ def restart(self):
             self.app.pargs.hhvm = True
 
         if self.app.pargs.nginx:
-            if EEVariables.ee_platform_distro == 'debian':
-                check_nginx = 'nginx-extras'
-            else:
-                check_nginx = 'nginx-custom'
-
-            if EEAptGet.is_installed(self, check_nginx):
+            if EEAptGet.is_installed(self, 'nginx-custom'):
                 services = services + ['nginx']
             else:
                 Log.info(self, "Nginx is not installed")
@@ -247,12 +232,7 @@ def status(self):
             self.app.pargs.hhvm = True
 
         if self.app.pargs.nginx:
-            if EEVariables.ee_platform_distro == 'debian':
-                check_nginx = 'nginx-extras'
-            else:
-                check_nginx = 'nginx-custom'
-
-            if EEAptGet.is_installed(self, check_nginx):
+            if EEAptGet.is_installed(self, 'nginx-custom'):
                 services = services + ['nginx']
             else:
                 Log.info(self, "Nginx is not installed")
@@ -317,12 +297,7 @@ def reload(self):
             self.app.pargs.postfix = True
 
         if self.app.pargs.nginx:
-            if EEVariables.ee_platform_distro == 'debian':
-                check_nginx = 'nginx-extras'
-            else:
-                check_nginx = 'nginx-custom'
-
-            if EEAptGet.is_installed(self, check_nginx):
+            if EEAptGet.is_installed(self, 'nginx-custom'):
                 services = services + ['nginx']
             else:
                 Log.info(self, "Nginx is not installed")

ee/cli/plugins/stack_upgrade.py

@@ -140,12 +140,7 @@ def default(self):
                     Log.info(self, "Mail server is not installed")
 
             if self.app.pargs.nginx:
-                if EEVariables.ee_platform_distro == 'debian':
-                    check_nginx = 'nginx-extras'
-                else:
-                    check_nginx = 'nginx-custom'
-
-                if EEAptGet.is_installed(self, check_nginx):
+                if EEAptGet.is_installed(self, 'nginx-custom'):
                     apt_packages = apt_packages + EEVariables.ee_nginx
                 else:
                     Log.info(self, "Nginx is not already installed")
@@ -191,33 +186,7 @@ def default(self):
 
             # Post Actions after package updates
             if set(EEVariables.ee_nginx).issubset(set(apt_packages)):
-                # Fix whitescreen of death beacuse of missing value
-                # fastcgi_param SCRIPT_FILENAME $request_filename; in file
-                # /etc/nginx/fastcgi_params
-                if not EEFileUtils.grep(self, '/etc/nginx/fastcgi_params',
-                                        'SCRIPT_FILENAME'):
-                    with open('/etc/nginx/fastcgi_params',
-                              encoding='utf-8', mode='a') as ee_nginx:
-                        ee_nginx.write('fastcgi_param \tSCRIPT_FILENAME '
-                                       '\t$request_filename;\n')
-
-                # Fix "ssl_prefer_server_ciphers" directive is duplicate
-                # that is arrived in latest Debian update
-                if EEVariables.ee_platform_distro == 'ubuntu':
-                    data = dict(version=EEVariables.ee_version, Ubuntu=True)
-                else:
-                    data = dict(version=EEVariables.ee_version, Debian=True)
-                Log.debug(self, 'Writting the nginx configuration to '
-                                'file /etc/nginx/conf.d/ee-nginx.conf ')
-                ee_nginx = open('/etc/nginx/conf.d/ee-nginx.conf',
-                                encoding='utf-8', mode='w')
-                self.app.render((data), 'nginx-core.mustache', out=ee_nginx)
-                ee_nginx.close()
-
-                EEGit.add(self, ["/etc/nginx"], msg="Updated Nginx")
-
                 EEService.restart_service(self, 'nginx')
-
             if set(EEVariables.ee_php).issubset(set(apt_packages)):
                 EEService.restart_service(self, 'php5-fpm')
             if set(EEVariables.ee_hhvm).issubset(set(apt_packages)):

ee/core/addswap.py

@@ -18,7 +18,7 @@ def add(self):
         """Swap addition with EasyEngine"""
         if EEVariables.ee_ram < 512:
             if EEVariables.ee_swap < 1000:
-                Log.info(self, "Adding SWAP")
+                Log.info(self, "Adding SWAP file, please wait...")
 
                 # Install dphys-swapfile
                 EEAptGet.update(self)

ee/core/nginxhashbucket.py

@@ -36,21 +36,6 @@ def hashbucket(self):
             else:
                 print(line, end='')
 
-    elif os.path.isfile('/etc/nginx/conf.d/ee-nginx.conf'):
-        if EEFileUtils.grep(self, "/etc/nginx/conf.d/ee-nginx.conf",
-                            "server_names_hash_bucket_size"):
-            for line in fileinput.FileInput("/etc/nginx/conf.d/ee-nginx.conf",
-                                            inplace=1):
-                if "server_names_hash_bucket_size" in line:
-                    print("server_names_hash_bucket_size {0};"
-                          .format(ngx_hash))
-                else:
-                    print(line, end='')
-
-        else:
-            with open('/etc/nginx/conf.d/ee-nginx.conf', 'a') as conf:
-                conf.write("server_names_hash_bucket_size {0};\n"
-                           .format(ngx_hash))
     else:
         EEFileUtils.searchreplace(self, '/etc/nginx/nginx.conf',
                                   "gzip_disable \"msie6\";",

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.1.9"
+    ee_version = "3.1.10"
 
     # EasyEngine packages versions
     ee_wp_cli = "0.19.1"
@@ -76,13 +76,21 @@ class EEVariables():
 
     # EasyEngine stack installation varibales
     # Nginx repo and packages
-    if ee_platform_distro == 'ubuntu':
-        ee_nginx_repo = "ppa:rtcamp/nginx"
-        ee_nginx = ["nginx-custom", "nginx-common"]
-    elif ee_platform_distro == 'debian':
-        ee_nginx_repo = ("deb http://packages.dotdeb.org {codename} all"
-                         .format(codename=ee_platform_codename))
-        ee_nginx = ["nginx-extras", "nginx-common"]
+    if ee_platform_codename == 'precise':
+        ee_nginx_repo = ("deb http://download.opensuse.org/repositories/home:"
+                         "/rtCamp:/EasyEngine/xUbuntu_12.04/ /")
+    elif ee_platform_codename == 'trusty':
+        ee_nginx_repo = ("deb http://download.opensuse.org/repositories/home:"
+                         "/rtCamp:/EasyEngine/xUbuntu_14.04/ /")
+    elif ee_platform_codename == 'wheezy':
+        ee_nginx_repo = ("deb http://download.opensuse.org/repositories/home:"
+                         "/rtCamp:/EasyEngine/Debian_7.0/ /")
+    elif ee_platform_codename == 'jessie':
+        ee_nginx_repo = ("deb http://download.opensuse.org/repositories/home:"
+                         "/rtCamp:/EasyEngine/Debian_8.0/ /")
+
+    ee_nginx = ["nginx-custom", "nginx-common"]
+    ee_nginx_key = '3050AC3CD2AE6F03'
 
     # PHP repo and packages
     if ee_platform_distro == 'ubuntu':