From 19a6656a9aecc9701558075205d9562db3ea384b Mon Sep 17 00:00:00 2001
From: Florent Audebert <florent.audebert@opendatasoft.com>
Date: Thu, 2 Jul 2020 10:45:55 +0200
Subject: [PATCH] refactor(pillar): factorize some defaults

---
 nginx/defaults.yaml    |  6 +++++-
 nginx/osfamilymap.yaml | 25 -------------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/nginx/defaults.yaml b/nginx/defaults.yaml
index 88f863ea..9fcc5ae6 100644
--- a/nginx/defaults.yaml
+++ b/nginx/defaults.yaml
@@ -2,7 +2,11 @@
 # vim: ft=yaml
 ---
 nginx:
-  lookup: {}
+  lookup:
+    package: nginx
+    service: nginx
+    conf_file: /etc/nginx/nginx.conf
+    snippets_dir: /etc/nginx/snippets
   install_from_source: false
   install_from_ppa: false
   install_from_repo: false
diff --git a/nginx/osfamilymap.yaml b/nginx/osfamilymap.yaml
index 146a5f28..f8623d5e 100644
--- a/nginx/osfamilymap.yaml
+++ b/nginx/osfamilymap.yaml
@@ -3,30 +3,22 @@
 ---
 Debian:
   lookup:
-    package: nginx
     passenger_package: passenger
     passenger_config_file: /etc/nginx/conf.d/passenger.conf
-    service: nginx
     webuser: www-data
-    conf_file: /etc/nginx/nginx.conf
     server_available: /etc/nginx/sites-available
     server_enabled: /etc/nginx/sites-enabled
-    snippets_dir: /etc/nginx/snippets
     server_use_symlink: true
     pid_file: /run/nginx.pid
     openssl_package: openssl
 
 CentOS:
   lookup:
-    package: nginx
     passenger_package: passenger
     passenger_config_file: /etc/nginx/conf.d/passenger.conf
-    service: nginx
     webuser: nginx
-    conf_file: /etc/nginx/nginx.conf
     server_available: /etc/nginx/conf.d
     server_enabled: /etc/nginx/conf.d
-    snippets_dir: /etc/nginx/snippets
     server_use_symlink: false
     pid_file: /run/nginx.pid
     rh_os_releasever: $releasever
@@ -36,15 +28,11 @@ CentOS:
 
 RedHat:
   lookup:
-    package: nginx
     passenger_package: passenger
     passenger_config_file: /etc/nginx/conf.d/passenger.conf
-    service: nginx
     webuser: nginx
-    conf_file: /etc/nginx/nginx.conf
     server_available: /etc/nginx/conf.d
     server_enabled: /etc/nginx/conf.d
-    snippets_dir: /etc/nginx/snippets
     server_use_symlink: false
     pid_file: /run/nginx.pid
     rh_os_releasever: $releasever
@@ -58,13 +46,9 @@ RedHat:
 
 Suse:
   lookup:
-    package: nginx
-    service: nginx
     webuser: nginx
-    conf_file: /etc/nginx/nginx.conf
     server_available: /etc/nginx/vhosts.d
     server_enabled: /etc/nginx/vhosts.d
-    snippets_dir: /etc/nginx/snippets
     server_use_symlink: false
     pid_file: /run/nginx.pid
     gpg_check: true
@@ -74,33 +58,24 @@ Suse:
 
 Arch:
   lookup:
-    package: nginx
-    service: nginx
     webuser: http
-    conf_file: /etc/nginx/nginx.conf
     server_available: /etc/nginx/sites-available
     server_enabled: /etc/nginx/sites-enabled
-    snippets_dir: /etc/nginx/snippets
     server_use_symlink: true
     openssl_package: openssl
 
 Gentoo:
   lookup:
     package: www-servers/nginx
-    service: nginx
     webuser: nginx
-    conf_file: /etc/nginx/nginx.conf
     server_available: /etc/nginx/sites-available
     server_enabled: /etc/nginx/sites-enabled
-    snippets_dir: /etc/nginx/snippets
     server_use_symlink: true
     openssl_package: dev-libs/openssl
 
 FreeBSD:
   lookup:
-    package: nginx
     passenger_package: passenger
-    service: nginx
     webuser: www
     conf_file: /usr/local/etc/nginx/nginx.conf
     server_available: /usr/local/etc/nginx/sites-available