saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci(travis): fix opensuse tests

Browse Source
This commit is contained in:
Imran Iqbal 2019-04-13 19:49:35 +01:00 committed by Imran Iqbal
parent 7e737c1863
commit c24d2b64d4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nginx/ng/map.jinja
View File

@ -64,8 +64,8 @@
'service': 'nginx', 'service': 'nginx',
'webuser': 'nginx', 'webuser': 'nginx',
'conf_file': '/etc/nginx/nginx.conf', 'conf_file': '/etc/nginx/nginx.conf',
'server_available': '/etc/nginx/sites-available', 'server_available': '/etc/nginx/vhosts.d',
'server_enabled': '/etc/nginx/sites-enabled', 'server_enabled': '/etc/nginx/vhosts.d',
'snippets_dir': '/etc/nginx/snippets', 'snippets_dir': '/etc/nginx/snippets',
'server_use_symlink': False, 'server_use_symlink': False,
'pid_file': '/run/nginx.pid', 'pid_file': '/run/nginx.pid',

3
test/integration/default/controls/config.rb
View File

@ -8,6 +8,9 @@ case os[:name]
when 'redhat', 'centos', 'fedora' when 'redhat', 'centos', 'fedora'
server_available = '/etc/nginx/conf.d' server_available = '/etc/nginx/conf.d'
server_enabled = '/etc/nginx/conf.d' server_enabled = '/etc/nginx/conf.d'
when 'opensuse'
server_available = '/etc/nginx/vhosts.d'
server_enabled = '/etc/nginx/vhosts.d'
end end
control 'Nginx configuration' do control 'Nginx configuration' do