From 0bce503349316de8dee29b688688fa7a3be5c72c Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 20 Oct 2022 12:47:23 +0200 Subject: [PATCH] Moving to redis official repository --- wo/cli/plugins/stack_pref.py | 15 +++++---------- wo/core/variables.py | 3 ++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 988df46..4dfcc93 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -108,17 +108,12 @@ def pre_pref(self, apt_packages): WORepo.add_key(self, WOVar.wo_php_key) # add redis repository if set(WOVar.wo_redis).issubset(set(apt_packages)): - if WOVar.wo_distro == 'ubuntu': + if not WOFileUtils.grepcheck( + self, '/etc/apt/sources.list/wo-repo.list', + 'redis.io'): Log.info(self, "Adding repository for Redis, please wait...") - Log.debug(self, 'Adding ppa for redis') - WORepo.add(self, ppa=WOVar.wo_redis_repo) - else: - if not WOFileUtils.grepcheck( - self, '/etc/apt/sources.list/wo-repo.list', - 'WordOps'): - Log.info(self, "Adding repository for Redis, please wait...") - WORepo.add(self, repo_url=WOVar.wo_nginx_repo) - WORepo.add_key(self, WOVar.wo_nginx_key) + WORepo.add(self, repo_url=WOVar.wo_redis_repo) + WORepo.download_key(self, WOVar.wo_redis_key_url) # nano if 'nano' in apt_packages: diff --git a/wo/core/variables.py b/wo/core/variables.py index 215a868..b29f040 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -208,7 +208,8 @@ class WOVar(): "deb https://packages.sury.org/php/ {codename} main" .format(codename=wo_platform_codename)) wo_php_key = 'AC0E47584A7A714D' - wo_redis_repo = ("deb https://packages.sury.org/php/ {codename} all" + wo_redis_key_url = "https://packages.redis.io/gpg" + wo_redis_repo = ("deb https://packages.redis.io/deb {codename} main" .format(codename=wo_platform_codename)) wo_redis = ['redis-server']