refactor(defaults): reorganize redis params

saltstack-formulas · Jul 13, 2020 · a0060ff · a0060ff
1 parent 51ae696
commit a0060ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/rspamd/defaults.yaml b/rspamd/defaults.yaml
@@ -3,10 +3,13 @@
 ---
 rspamd:
   use_upstream_repo: true
-  manage_redis: false
   repo:
     humanname: Rspamd Official Repository
 
+  manage_redis: false
+  redis_pkg: redis
+  redis_service: redis
+
   pkg: rspamd
 
   base_dir: /etc/rspamd

diff --git a/rspamd/osfamilymap.yaml b/rspamd/osfamilymap.yaml
@@ -2,17 +2,15 @@
 # vim: ft=yaml
 ---
 Debian:
-  redis_pkg: redis-server
-  redis_service: redis-server
   repo:
     enabled: true
     name: deb http://rspamd.com/apt-stable/ {{ grains['oscodename'] }} main
     file: /etc/apt/sources.list.d/rspamd.list
     key_url: https://rspamd.com/apt-stable/gpg.key
 
+# Arch has no osmajorrelease and this piece of code makes it fail
+{% if grains['os']|lower != 'arch' %}
 RedHat:
-  redis_pkg: redis
-  redis_service: redis
   repo:
     name: rspamd
     enabled: true
@@ -23,3 +21,7 @@ RedHat:
     # yamllint enable rule:line-length
     gpgcheck: 1
     gpgkey: http://rspamd.com/rpm/gpg.key
+{% endif %}
+
+Arch:
+  use_upstream_repo: false