update nginx, set wan interface for wo dashboard

CHANGELOG.md

@@ -47,6 +47,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Nginx locations template is the same for php7.2 & 7.3
 - backend SSL configuration now stored in /var/www/22222/conf/nginx/ssl.conf
 - Install Netdata with static pre-built binaries instead of having to compile it from source
+- Nginx updated to new stable release (1.16.0)
 
 #### Fixed
 

README.md

@@ -39,7 +39,7 @@
 
 - **Easy to install** : One step automated installer with migration from EasyEngine v3 support
 - **Fast deployment** : Fast and automated WordPress, Nginx, PHP, MySQL & Redis installation
-- **Up-to-date** : Nginx 1.14.2 with Brotli support, PHP 7.2 & 7.3, MariaDB 10.3 & Redis 5.0
+- **Up-to-date** : Nginx 1.16.0 with Brotli support, PHP 7.2 & 7.3, MariaDB 10.3 & Redis 5.0
 - **Secured** : Hardened WordPress security with strict Nginx location directives
 - **Powerful** : Optimized Nginx configurations with multiple cache backends support
 - **SSL** : Let's Encrypt SSL certificates handled by acme.sh
@@ -76,7 +76,7 @@ WordOps made some fundamental changes:
 - We've deprecated the mail stack. As an alternative, you can take a look at [Mail-in-a-Box](https://github.com/mail-in-a-box/mailinabox), [iRedMail](https://www.iredmail.org/) or [Caesonia](https://github.com/vedetta-com/caesonia). As Roundcube alternative, there is [Rainloop](https://www.rainloop.net/) or [Afterlogic WebMail](https://github.com/afterlogic/webmail-lite-8)
 - Support for w3tc is dropped as a security precaution.
 - PHP 5.6 has been replaced by PHP 7.2 and PHP 7.0 has been replaced by PHP 7.3.
-- Nginx-ee package has been replaced by Nginx-wo (based on Nginx stable v1.14.2 with Brotli support)
+- Nginx-ee package has been replaced by Nginx-wo (based on Nginx stable v1.16.0 with Brotli support)
 - HHVM stack has been removed
 - Let's Encrypt stack isn't based on letsencrypt-auto anymore, we use acme.sh to handle SSL certificates
 
@@ -164,6 +164,7 @@ Apps & Tools shipped with WordOps
 - [phpRedisAdmin](https://github.com/erikdubbelboer/phpRedisAdmin)
 - [PHPMemcachedAdmin](https://github.com/elijaa/phpmemcachedadmin)
 - [opcacheGUI](https://github.com/amnuts/opcache-gui)
+- [eXtplorer](https://github.com/soerennb/extplorer)
 
 ## License
 

setup.py

@@ -46,7 +46,8 @@ except Exception as e:
 
     while not re.match(r"^[A-Za-z0-9\.\+_-]+@[A-Za-z0-9\._-]+\.[a-zA-Z]*$",
                        wo_email):
-        print("Whoops, seems like you made a typo - the e-mailaddress is invalid...")
+        print("Whoops, seems like you made a typo - "
+              "the e-mailaddress is invalid...")
         wo_email = input("Enter your email: ")
 
     os.system("git config --global user.name {0}".format(wo_user))

wo/cli/plugins/stack.py

@@ -1135,6 +1135,12 @@ class WOStackController(CementBaseController):
                     WOExtract.extract(self, '/tmp/wo-dashboard.tar.gz',
                                       '{0}22222/htdocs'
                                       .format(WOVariables.wo_webroot))
+                if WOVariables.wo_wan_interface != 'eth0':
+                    WOFileUtils.searchreplace(self, "{0}22222/htdocs/index.php"
+                                              .format(WOVariables.wo_webroot),
+                                              "eth0",
+                                              "{0}".format(WOVariables.wo_wan_interface))
+
                     Log.debug(self, "Setting Privileges to "
                               "{0}22222/htdocs"
                               .format(WOVariables.wo_webroot))

wo/core/variables.py

@@ -22,6 +22,13 @@ class WOVariables():
     if wo_wpcli_path == '':
         wo_wpcli_path = '/usr/local/bin/wp '
 
+    # get wan network interface name
+    wo_wan_interface = os.popen("ip -4 route get 8.8.8.8 | "
+                                "grep -oP \"dev [^[:space:]]+ \" "
+                                "| cut -d ' ' -f 2").read()
+    if wo_wan_interface == '':
+        wo_wan_interface = 'eth0'
+
     # Current date and time of System
     wo_date = datetime.datetime.now().strftime('%d%b%Y%H%M%S')