diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 99dc70c17..81e34d77a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,7 @@ +v3.8.1 - May 30, 2018 +- Fix update command +- Fix issue with admin tools urls + v3.8.0 - May 29, 2018 - Add support for Ubuntu 18.04 and remove support for Ubuntu 12.04 - Nginx build for EasyEngine updated to 1.14.0 diff --git a/ee/cli/templates/locations-php7.mustache b/ee/cli/templates/locations-php7.mustache index 7c437e18b..ee0ebb484 100644 --- a/ee/cli/templates/locations-php7.mustache +++ b/ee/cli/templates/locations-php7.mustache @@ -41,28 +41,28 @@ if ($uri ~* "^.+(readme|license|example)\.(txt|html)$") { return 403; } # Status pages -location /nginx_status { +location = /nginx_status { stub_status on; access_log off; include common/acl.conf; } -location ~ ^/(status|ping) { +location ~ ^/(status|ping)$ { include fastcgi_params; fastcgi_pass php7; include common/acl.conf; } # EasyEngine (ee) utilities # phpMyAdmin settings -location /pma { +location = /pma { return 301 https://$host:22222/db/pma; } -location /phpMyAdmin { +location = /phpMyAdmin { return 301 https://$host:22222/db/pma; } -location /phpmyadmin { +location = /phpmyadmin { return 301 https://$host:22222/db/pma; } # Adminer settings -location /adminer { +location = /adminer { return 301 https://$host:22222/db/adminer; } diff --git a/ee/cli/templates/locations.mustache b/ee/cli/templates/locations.mustache index df651d7a2..3bfda44f4 100644 --- a/ee/cli/templates/locations.mustache +++ b/ee/cli/templates/locations.mustache @@ -41,28 +41,28 @@ if ($uri ~* "^.+(readme|license|example)\.(txt|html)$") { return 403; } # Status pages -location /nginx_status { +location = /nginx_status { stub_status on; access_log off; include common/acl.conf; } -location ~ ^/(status|ping) { +location ~ ^/(status|ping)$ { include fastcgi_params; fastcgi_pass php; include common/acl.conf; } # EasyEngine (ee) utilities # phpMyAdmin settings -location /pma { +location = /pma { return 301 https://$host:22222/db/pma; } -location /phpMyAdmin { +location = /phpMyAdmin { return 301 https://$host:22222/db/pma; } -location /phpmyadmin { +location = /phpmyadmin { return 301 https://$host:22222/db/pma; } # Adminer settings -location /adminer { +location = /adminer { return 301 https://$host:22222/db/adminer; } diff --git a/ee/core/download.py b/ee/core/download.py index c47854d0a..e3280111c 100644 --- a/ee/core/download.py +++ b/ee/core/download.py @@ -22,7 +22,9 @@ def download(self, packages): if not os.path.exists(directory): os.makedirs(directory) Log.info(self, "Downloading {0:20}".format(pkg_name), end=' ') - urllib.request.urlretrieve(url, filename) + req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'}) + with urllib.request.urlopen(req) as response, open(filename, 'wb') as out_file: + out_file.write(response.read()) Log.info(self, "{0}".format("[" + Log.ENDC + "Done" + Log.OKBLUE + "]")) except urllib.error.URLError as e: diff --git a/ee/core/variables.py b/ee/core/variables.py index 43d86f074..bce6e13cf 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -12,7 +12,7 @@ class EEVariables(): """Intialization of core variables""" # EasyEngine version - ee_version = "3.8.0" + ee_version = "3.8.1" # EasyEngine packages versions ee_wp_cli = "1.5.1" ee_adminer = "4.6.2" diff --git a/install b/install index 38efffffb..27ac955cf 100644 --- a/install +++ b/install @@ -48,7 +48,7 @@ fi # Define variables for later use ee_branch=$1 readonly ee_version_old="2.2.3" -readonly ee_version_new="3.8.0" +readonly ee_version_new="3.8.1" readonly ee_log_dir=/var/log/ee/ readonly ee_install_log=/var/log/ee/install.log readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}') diff --git a/setup.py b/setup.py index 5bfe5f4de..bd088c13a 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig') setup(name='ee', - version='3.8.0', + version='3.8.1', description=long_description, long_description=long_description, classifiers=[],