Skip to content

Commit 5a9f6e0

Browse files
committed
refactor(pillar): factorize some defaults
1 parent b8a77d6 commit 5a9f6e0

File tree

2 files changed

+5
-26
lines changed

2 files changed

+5
-26
lines changed

nginx/defaults.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
# vim: ft=yaml
33
---
44
nginx:
5-
lookup: {}
5+
lookup:
6+
package: nginx
7+
service: nginx
8+
conf_file: /etc/nginx/nginx.conf
9+
snippets_dir: /etc/nginx/snippets
610
install_from_source: False
711
install_from_ppa: False
812
install_from_repo: False

nginx/osfamilymap.yaml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,22 @@
33
---
44
Debian:
55
lookup:
6-
package: nginx
76
passenger_package: passenger
87
passenger_config_file: /etc/nginx/conf.d/passenger.conf
9-
service: nginx
108
webuser: www-data
11-
conf_file: /etc/nginx/nginx.conf
129
server_available: /etc/nginx/sites-available
1310
server_enabled: /etc/nginx/sites-enabled
14-
snippets_dir: /etc/nginx/snippets
1511
server_use_symlink: True
1612
pid_file: /run/nginx.pid
1713
openssl_package: openssl
1814

1915
CentOS:
2016
lookup:
21-
package: nginx
2217
passenger_package: passenger
2318
passenger_config_file: /etc/nginx/conf.d/passenger.conf
24-
service: nginx
2519
webuser: nginx
26-
conf_file: /etc/nginx/nginx.conf
2720
server_available: /etc/nginx/conf.d
2821
server_enabled: /etc/nginx/conf.d
29-
snippets_dir: /etc/nginx/snippets
3022
server_use_symlink: False
3123
pid_file: /run/nginx.pid
3224
rh_os_releasever: $releasever
@@ -36,15 +28,11 @@ CentOS:
3628

3729
RedHat:
3830
lookup:
39-
package: nginx
4031
passenger_package: passenger
4132
passenger_config_file: /etc/nginx/conf.d/passenger.conf
42-
service: nginx
4333
webuser: nginx
44-
conf_file: /etc/nginx/nginx.conf
4534
server_available: /etc/nginx/conf.d
4635
server_enabled: /etc/nginx/conf.d
47-
snippets_dir: /etc/nginx/snippets
4836
server_use_symlink: False
4937
pid_file: /run/nginx.pid
5038
rh_os_releasever: $releasever
@@ -58,13 +46,9 @@ RedHat:
5846

5947
Suse:
6048
lookup:
61-
package: nginx
62-
service: nginx
6349
webuser: nginx
64-
conf_file: /etc/nginx/nginx.conf
6550
server_available: /etc/nginx/vhosts.d
6651
server_enabled: /etc/nginx/vhosts.d
67-
snippets_dir: /etc/nginx/snippets
6852
server_use_symlink: False
6953
pid_file: /run/nginx.pid
7054
gpg_check: True
@@ -73,33 +57,24 @@ Suse:
7357

7458
Arch:
7559
lookup:
76-
package: nginx
77-
service: nginx
7860
webuser: http
79-
conf_file: /etc/nginx/nginx.conf
8061
server_available: /etc/nginx/sites-available
8162
server_enabled: /etc/nginx/sites-enabled
82-
snippets_dir: /etc/nginx/snippets
8363
server_use_symlink: True
8464
openssl_package: openssl
8565

8666
Gentoo:
8767
lookup:
8868
package: www-servers/nginx
89-
service: nginx
9069
webuser: nginx
91-
conf_file: /etc/nginx/nginx.conf
9270
server_available: /etc/nginx/sites-available
9371
server_enabled: /etc/nginx/sites-enabled
94-
snippets_dir: /etc/nginx/snippets
9572
server_use_symlink: True
9673
openssl_package: dev-libs/openssl
9774

9875
FreeBSD:
9976
lookup:
100-
package: nginx
10177
passenger_package: passenger
102-
service: nginx
10378
webuser: www
10479
conf_file: /usr/local/etc/nginx/nginx.conf
10580
server_available: /usr/local/etc/nginx/sites-available

0 commit comments

Comments
 (0)