From 5f983581c4d781c538f28a52f71bc869a9acfd6f Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Thu, 29 Aug 2019 15:35:03 +0200
Subject: [PATCH] Fix stack remove/purge

---
 wo/cli/plugins/stack.py | 75 ++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index 84aa419..40e91c4 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -277,10 +277,10 @@ class WOStackController(CementBaseController):
 
             # PHPMYADMIN
             if pargs.phpmyadmin:
+                pargs.composer = True
                 if not os.path.isdir('/var/www/22222/htdocs/db/pma'):
                     Log.debug(self, "Setting packages variable "
                               "for phpMyAdmin ")
-                    pargs.composer = True
                     packages = packages + [["https://github.com/phpmyadmin/"
                                             "phpmyadmin/archive/STABLE.tar.gz",
                                             "/var/lib/wo/tmp/pma.tar.gz",
@@ -289,6 +289,23 @@ class WOStackController(CementBaseController):
                     Log.debug(self, "phpMyAdmin already installed")
                     Log.info(self, "phpMyAdmin already installed")
 
+                    # PHPREDISADMIN
+            if pargs.phpredisadmin:
+                pargs.composer = True
+                if not os.path.isdir('/var/www/22222/htdocs/'
+                                     'cache/redis/phpRedisAdmin'):
+                    Log.debug(
+                        self, "Setting packages variable for phpRedisAdmin")
+                    packages = packages + [["https://github.com/"
+                                            "erikdubbelboer/"
+                                            "phpRedisAdmin/archive"
+                                            "/v1.11.3.tar.gz",
+                                            "/var/lib/wo/tmp/pra.tar.gz",
+                                            "phpRedisAdmin"]]
+                else:
+                    Log.debug(self, "phpRedisAdmin already installed")
+                    Log.info(self, "phpRedisAdmin already installed")
+
             # Composer
             if pargs.composer:
                 if not os.path.isfile('/usr/local/bin/composer'):
@@ -301,23 +318,6 @@ class WOStackController(CementBaseController):
                     Log.debug(self, "Composer already installed")
                     Log.info(self, "Composer already installed")
 
-            # PHPREDISADMIN
-            if pargs.phpredisadmin:
-                if not os.path.isdir('/var/www/22222/htdocs/'
-                                     'cache/redis/phpRedisAdmin'):
-                    Log.debug(
-                        self, "Setting packages variable for phpRedisAdmin")
-                    pargs.composer = True
-                    packages = packages + [["https://github.com/"
-                                            "erikdubbelboer/"
-                                            "phpRedisAdmin/archive"
-                                            "/v1.11.3.tar.gz",
-                                            "/var/lib/wo/tmp/pra.tar.gz",
-                                            "phpRedisAdmin"]]
-                else:
-                    Log.debug(self, "phpRedisAdmin already installed")
-                    Log.info(self, "phpRedisAdmin already installed")
-
             # ADMINER
             if pargs.adminer:
                 Log.debug(self, "Setting packages variable for Adminer ")
@@ -632,17 +632,15 @@ class WOStackController(CementBaseController):
                                    .format(WOVariables.wo_webroot)]
 
         if (packages) or (apt_packages):
-            if not pargs.force:
-                wo_prompt = input('Are you sure you to want to'
-                                  ' remove from server.'
-                                  '\nPackage configuration will remain'
-                                  ' on server after this operation.\n'
-                                  'Any answer other than '
-                                  '"yes" will be stop this'
-                                  ' operation :  ')
-                if (wo_prompt != 'YES' or wo_prompt != 'yes'):
-                    Log.error(self, "Not removing packages")
-
+            if (not pargs.force):
+                start_remove = input('Are you sure you to want to'
+                                     ' remove from server.'
+                                     '\nPackage configuration will remain'
+                                     ' on server after this operation.\n'
+                                     'Remove stacks [y/N]')
+                if start_remove != "Y" and start_remove != "y":
+                    Log.error(self, "Not starting stack removal")
+            Log.info(self, "Removing stacks, please wait...")
             if (set(["nginx-custom"]).issubset(set(apt_packages))):
                 WOService.stop_service(self, 'nginx')
 
@@ -813,15 +811,16 @@ class WOStackController(CementBaseController):
                                    .format(WOVariables.wo_webroot)]
 
         if (packages) or (apt_packages):
-            if not pargs.force:
-                wo_prompt = input('Are you sure you to want to purge '
-                                  'from server '
-                                  'along with their configuration'
-                                  ' packages,\nAny answer other than '
-                                  '"yes" will be stop this '
-                                  'operation :')
-                if (wo_prompt != 'YES' or wo_prompt != 'yes'):
-                    Log.error(self, "Not purging packages")
+            if (not pargs.force):
+                start_purge = input('Are you sure you to want to'
+                                    ' purge stacks from this server ?'
+                                    '\nPackage configuration and data '
+                                    'will not remain'
+                                    ' on this server after this operation.\n'
+                                    'Purge stacks [y/N]')
+                if start_purge != "Y" and start_purge != "y":
+                    Log.error(self, "Not starting stack purge")
+            Log.info(self, "Purging stacks, please wait...")
 
             if (set(["nginx-custom"]).issubset(set(apt_packages))):
                 WOService.stop_service(self, 'nginx')