From 89ebbe9cd622e9105775aa857f4caa87750a0a1f Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Tue, 6 Aug 2019 11:37:03 +0200
Subject: [PATCH] Fix for redis and variable glob

---
 wo/cli/plugins/stack_pref.py    | 18 +++++++++---------
 wo/cli/plugins/sync.py          |  1 +
 wo/cli/templates/redis.mustache |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py
index 3726783..f6700e6 100644
--- a/wo/cli/plugins/stack_pref.py
+++ b/wo/cli/plugins/stack_pref.py
@@ -536,15 +536,15 @@ def post_pref(self, apt_packages, packages):
                             self, "Failed to generate HTTPS "
                             "certificate for 22222")
 
-                    if not os.path.isfile('{0}22222/conf/nginx/ssl.conf'
-                                          .format(WOVariables.wo_webroot)):
+                if not os.path.isfile('{0}22222/conf/nginx/ssl.conf'
+                                      .format(WOVariables.wo_webroot)):
 
-                        with open("/var/www/22222/conf/nginx/"
-                                  "ssl.conf", "a") as php_file:
-                            php_file.write("ssl_certificate "
-                                           "/var/www/22222/cert/22222.crt;\n"
-                                           "ssl_certificate_key "
-                                           "/var/www/22222/cert/22222.key;\n")
+                    with open("/var/www/22222/conf/nginx/"
+                              "ssl.conf", "a") as php_file:
+                        php_file.write("ssl_certificate "
+                                       "/var/www/22222/cert/22222.crt;\n"
+                                       "ssl_certificate_key "
+                                       "/var/www/22222/cert/22222.key;\n")
 
                 # Nginx Configation into GIT
                 WOGit.add(self,
@@ -574,7 +574,7 @@ def post_pref(self, apt_packages, packages):
         # create nginx configuration for redis
         if set(WOVariables.wo_redis).issubset(set(apt_packages)):
             if os.path.isdir('/etc/nginx/common'):
-                data = dict()
+                data = dict(upstream="php72")
                 Log.debug(self, 'Writting the nginx configuration to '
                           'file /etc/nginx/common/redis-php72.conf')
                 wo_nginx = open('/etc/nginx/common/redis-php72.conf',
diff --git a/wo/cli/plugins/sync.py b/wo/cli/plugins/sync.py
index d646544..8495bec 100644
--- a/wo/cli/plugins/sync.py
+++ b/wo/cli/plugins/sync.py
@@ -4,6 +4,7 @@ from wo.core.fileutils import WOFileUtils
 from wo.cli.plugins.sitedb import *
 from wo.core.mysql import *
 from wo.core.logging import Log
+import glob
 
 
 def wo_sync_hook(app):
diff --git a/wo/cli/templates/redis.mustache b/wo/cli/templates/redis.mustache
index dcbb0c1..88a49e0 100644
--- a/wo/cli/templates/redis.mustache
+++ b/wo/cli/templates/redis.mustache
@@ -10,7 +10,7 @@ location / {
 location /redis-fetch {
     internal  ;
     set  $redis_key $args;
-    redis_pass  redis;
+    redis_pass redis;
 }
 location /redis-store {
     internal  ;