From c24d2b64d47d0a6fd99b198f66961c96e4a8ce05 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 13 Apr 2019 19:49:35 +0100 Subject: [PATCH] ci(travis): fix `opensuse` tests --- nginx/ng/map.jinja | 4 ++-- test/integration/default/controls/config.rb | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja index 413306a..9e1f5e2 100644 --- a/nginx/ng/map.jinja +++ b/nginx/ng/map.jinja @@ -64,8 +64,8 @@ 'service': 'nginx', 'webuser': 'nginx', 'conf_file': '/etc/nginx/nginx.conf', - 'server_available': '/etc/nginx/sites-available', - 'server_enabled': '/etc/nginx/sites-enabled', + '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', diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index a0ca2cb..8a32ac6 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -8,6 +8,9 @@ case os[:name] when 'redhat', 'centos', 'fedora' server_available = '/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 control 'Nginx configuration' do