redis ssl cleanup

Author: chreman

docker-compose-dataworker.yml

@@ -12,7 +12,6 @@ services:
       REDIS_PORT: "${REDIS_PORT}"
       REDIS_DB: "${REDIS_DB}"
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
-      REDIS_SSL: "${REDIS_SSL}"
     restart: always
     volumes:
       - /opt/local/renv/cache:/renv/cache

docker-compose.yml

@@ -52,7 +52,6 @@ services:
       REDIS_PORT: "${REDIS_PORT}"
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
       REDIS_DB: "${REDIS_DB}"
-      REDIS_SSL: "${REDIS_SSL}"
       BEHIND_PROXY: "${BEHIND_PROXY}"
       DEFAULT_DATABASE: "${DEFAULT_DATABASE}"
       DATABASES: "${DATABASES}"
@@ -90,7 +89,6 @@ services:
       REDIS_PORT: "${REDIS_PORT}"
       REDIS_DB: "${REDIS_DB}"
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
-      REDIS_SSL: "${REDIS_SSL}"
       LOGLEVEL: "${LOGLEVEL}"
       TRIPLE_USER: "${TRIPLE_USER}"
       TRIPLE_PASS: "${TRIPLE_PASS}"
@@ -115,7 +113,6 @@ services:
       REDIS_PORT: "${REDIS_PORT}"
       REDIS_DB: "${REDIS_DB}"
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
-      REDIS_SSL: "${REDIS_SSL}"
       LOGLEVEL: "${LOGLEVEL}"
     restart: always
     depends_on:
@@ -133,7 +130,6 @@ services:
       REDIS_PORT: "${REDIS_PORT}"
       REDIS_DB: "${REDIS_DB}"
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
-      REDIS_SSL: "${REDIS_SSL}"
       LOGLEVEL: "${LOGLEVEL}"
     restart: always
     volumes:
@@ -152,7 +148,6 @@ services:
       REDIS_PORT: "${REDIS_PORT}"
       REDIS_DB: "${REDIS_DB}"
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
-      REDIS_SSL: "${REDIS_SSL}"
       LOGLEVEL: "${LOGLEVEL}"
       LOGFILE: "/var/log/headstart/headstart.log"
       RENV_VERSION: 0.14.0-5
@@ -178,7 +173,6 @@ services:
       REDIS_PORT: "${REDIS_PORT}"
       REDIS_DB: "${REDIS_DB}"
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
-      REDIS_SSL: "${REDIS_SSL}"
       LOGLEVEL: "${LOGLEVEL}"
       LOGFILE: "/var/log/headstart/headstart.log"
       RENV_VERSION: 0.14.0-5
@@ -204,7 +198,6 @@ services:
       REDIS_PORT: "${REDIS_PORT}"
       REDIS_DB: "${REDIS_DB}"
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
-      REDIS_SSL: "${REDIS_SSL}"
       LOGLEVEL: "${LOGLEVEL}"
       LOGFILE: "/var/log/headstart/headstart.log"
       RENV_VERSION: 0.14.0-5

server/workers/api/src/apis/utils.py

@@ -11,8 +11,7 @@
     "port": os.getenv("REDIS_PORT"),
     "db": os.getenv("REDIS_DB"),
     "password": os.getenv("REDIS_PASSWORD"),
-    "client_name": "api",
-    "ssl": True if os.getenv("REDIS_SSL") == "true" else False
+    "client_name": "api"
 }
 redis_store = redis.StrictRedis(**redis_config)
 

server/workers/base/run_base.py

@@ -10,8 +10,7 @@
         "port": os.getenv("REDIS_PORT"),
         "db": os.getenv("REDIS_DB"),
         "password": os.getenv("REDIS_PASSWORD"),
-        "client_name": "base_retrieval",
-        "ssl": True if os.getenv("REDIS_SSL") == "true" else False
+        "client_name": "base_retrieval"
     }
 
     redis_store = redis.StrictRedis(**redis_config)

server/workers/dataprocessing/run_dataprocessing.py

@@ -10,8 +10,7 @@
         "port": os.getenv("REDIS_PORT"),
         "db": os.getenv("REDIS_DB"),
         "password": os.getenv("REDIS_PASSWORD"),
-        "client_name": "dataprocessing",
-        "ssl": True if os.getenv("REDIS_SSL") == "true" else False
+        "client_name": "dataprocessing"
     }
 
     redis_store = redis.StrictRedis(**redis_config)

server/workers/flavorconfigs/example.env

@@ -13,7 +13,6 @@ REDIS_HOST=stable_redis_1
 REDIS_PORT=6379
 REDIS_DB=0
 REDIS_PASSWORD=redis_password
-REDIS_SSL=false
 LOGLEVEL=INFO
 
 BEHIND_PROXY=True

server/workers/gsheets/run_gsheets.py

@@ -10,8 +10,7 @@
         "port": os.getenv("REDIS_PORT"),
         "db": os.getenv("REDIS_DB"),
         "password": os.getenv("REDIS_PASSWORD"),
-        "client_name": "gsheets_retrieval",
-        "ssl": True if os.getenv("REDIS_SSL") == "true" else False
+        "client_name": "gsheets_retrieval"
     }
     redis_store = redis.StrictRedis(**redis_config)
     gc = GSheetsClient(redis_store, os.environ.get("LOGLEVEL", "INFO"))

server/workers/openaire/run_openaire.py

@@ -10,8 +10,7 @@
         "port": os.getenv("REDIS_PORT"),
         "db": os.getenv("REDIS_DB"),
         "password": os.getenv("REDIS_PASSWORD"),
-        "client_name": "openaire_retrieval",
-        "ssl": True if os.getenv("REDIS_SSL") == "true" else False
+        "client_name": "openaire_retrieval"
     }
     redis_store = redis.StrictRedis(**redis_config)
     wrapper = OpenAIREClient("./other-scripts", "run_openaire.R", redis_store,

server/workers/pubmed/run_pubmed.py

@@ -10,8 +10,7 @@
         "port": os.getenv("REDIS_PORT"),
         "db": os.getenv("REDIS_DB"),
         "password": os.getenv("REDIS_PASSWORD"),
-        "client_name": "pubmed_retrieval",
-        "ssl": True if os.getenv("REDIS_SSL") == "true" else False
+        "client_name": "pubmed_retrieval"
     }
     redis_store = redis.StrictRedis(**redis_config)
     wrapper = PubMedClient("./other-scripts", "run_pubmed.R", redis_store,