Merge pull request 'Change redis to redis7' (#75 ) from salt-redis7 into production

Reviewed-on: #75 Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
Change redis to redis7
2023-06-28 22:00:16 +02:00 · 2023-06-28 21:56:54 +02:00
1 changed files with 6 additions and 6 deletions
--- a/salt/profile/salt/master.sls
+++ b/salt/profile/salt/master.sls
@ -41,7 +41,7 @@ salt_master_extra_packages:
      - python3-ldap
      - python3-pynetbox
      - python3-redis
-      - redis
+      - redis7
      - salt-bash-completion
      - salt-fish-completion
      - salt-keydiff
@ -68,7 +68,7 @@ salt_master_extra_packages:
    - group: redis
    - mode: '0640'
    - require:
-      - pkg: redis
+      - pkg: redis7

 /var/lib/redis/salt:
  file.directory:
@ -76,19 +76,19 @@ salt_master_extra_packages:
    - group: redis
    - mode: '0750'
    - require:
-      - pkg: redis
+      - pkg: redis7

 salt_redis_service_enable:
  service.enabled:
    - name: {{ redis_service }}
    - require:
-      - pkg: redis
+      - pkg: redis7

 salt_redis_service_start:
  service.running:
    - name: {{ redis_service }}
    - require:
-      - pkg: redis
+      - pkg: redis7
    - watch:
      - file: {{ redis_config }}

@ -96,7 +96,7 @@ salt_redis_membership:
  group.present:
    - name: redis
    - require:
-      - pkg: redis
+      - pkg: redis7
    - addusers:
      - {{ master_pillar['user'] }}
 {%- if pillar['secret_salt'] is defined %}
Author	SHA1	Message	Date
Georg Pfuetzenreuter	1bd2f39312	Merge pull request 'Change redis to redis7' (#75 ) from salt-redis7 into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #75 Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>	2023-06-28 22:00:16 +02:00
Georg Pfuetzenreuter	58c100acc1	Change redis to redis7 All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Leap 15.5 renamed the package, "redis" will try to install Redis 6 and cause a conflict. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-06-28 21:56:54 +02:00