From f3a74545c353950fd64b0dd3534e77af49e6e884 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Wed, 19 Jun 2019 17:14:26 +0200
Subject: [PATCH] Fix phpredisadmin and update changelog

---
 CHANGELOG.md            | 18 ++++++++++++++++++
 wo/cli/plugins/stack.py | 14 ++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cda1f0..9516c74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### v3.9.6 - [Unreleased]
 
+#### Changed
+
+- phpRedisAdmin is now installed with the stack "--admin"
+
+#### Fixed
+
+- phpRedisAdmin installation
+
+### v3.9.5.3 - 2019-06-18
+
+#### Added
+
+- Argument `--preserve` with the command `wo update` to keep current Nginx configuration
+
+#### Fixed
+
+- Nginx upgrade failure when running wo update
+
 ### v3.9.5.2 - 2019-06-17
 
 #### Added
diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index a9c05a6..962a219 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -1371,15 +1371,20 @@ class WOStackController(CementBaseController):
                     Log.debug(self, "Creating new directory "
                               "{0}22222/htdocs/cache/redis"
                               .format(WOVariables.wo_webroot))
-                    os.makedirs('{0}22222/htdocs/cache/redis'
+                    os.makedirs('{0}22222/htdocs/cache/redis/phpRedisAdmin'
                                 .format(WOVariables.wo_webroot))
+                    WOFileUtils.chown(self, '{0}22222'
+                                      .format(WOVariables.wo_webroot),
+                                      WOVariables.wo_php_user,
+                                      WOVariables.wo_php_user,
+                                      recursive=True)
                     if os.path.isfile("/usr/local/bin/composer"):
                         WOShellExec.cmd_exec(self, "sudo -u www-data -H "
                                              "composer "
                                              "create-project -n -s dev "
                                              "erik-dubbelboer/php-redis-admin "
                                              "/var/www/22222/htdocs/cache"
-                                             "/redis/phpRedisAdmin/ ")
+                                             "/redis/phpRedisAdmin ")
                 Log.debug(self, 'Setting Privileges of webroot permission to  '
                           '{0}22222/htdocs/cache/file '
                           .format(WOVariables.wo_webroot))
@@ -1429,6 +1434,7 @@ class WOStackController(CementBaseController):
                 self.app.pargs.utils = True
                 self.app.pargs.netdata = True
                 self.app.pargs.dashboard = True
+                self.app.pargs.phpredisadmin = True
 
             # Redis
             if self.app.pargs.redis:
@@ -1552,8 +1558,8 @@ class WOStackController(CementBaseController):
             # PHPREDISADMIN
             if self.app.pargs.phpredisadmin:
                 Log.debug(self, "Setting packages variable for phpRedisAdmin")
-                packages = packages + [["https://github.com/ErikDubbelboer/"
-                                        "phpRedisAdmin/archive/master.tar.gz",
+                packages = packages + [["https://github.com/erikdubbelboer/"
+                                        "phpRedisAdmin/archive/v1.11.3.tar.gz",
                                         "/var/lib/wo/tmp/pra.tar.gz",
                                         "phpRedisAdmin"],
                                        ["https://github.com/nrk/predis/"