diff options
| author | Jordan Borean <jborean93@gmail.com> | 2019-01-15 06:26:16 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-15 06:26:16 +1000 |
| commit | 91522bd9c47ab4d27b71a7c5f9c4d4c090fd7551 (patch) | |
| tree | d16988a129c5ec6a59f4fa76ec94d146a9b7022e /test/integration/targets/subversion | |
| parent | 3f705182575fe8f97c53197b393dc2ec286f6806 (diff) | |
| download | ansible-91522bd9c47ab4d27b71a7c5f9c4d4c090fd7551.tar.gz | |
test subversion - support Ubuntu 18.04 (#50791)
Diffstat (limited to 'test/integration/targets/subversion')
3 files changed, 17 insertions, 5 deletions
diff --git a/test/integration/targets/subversion/tasks/setup.yml b/test/integration/targets/subversion/tasks/setup.yml index 77331bd126..5d64519572 100644 --- a/test/integration/targets/subversion/tasks/setup.yml +++ b/test/integration/targets/subversion/tasks/setup.yml @@ -1,6 +1,11 @@ --- - name: load OS specific vars - include_vars: '{{ ansible_os_family }}.yml' + include_vars: '{{ item }}' + with_first_found: + - files: + - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml' + - '{{ ansible_os_family }}.yml' + paths: '../vars' - name: install SVN pre-reqs package: diff --git a/test/integration/targets/subversion/templates/subversion.conf.j2 b/test/integration/targets/subversion/templates/subversion.conf.j2 index 31e264a0e0..07e7083a6b 100644 --- a/test/integration/targets/subversion/templates/subversion.conf.j2 +++ b/test/integration/targets/subversion/templates/subversion.conf.j2 @@ -1,7 +1,10 @@ {% if ansible_os_family == "Debian" %} -{% if ansible_distribution_version == "14.04" %} -{# Ubuntu 14.04 conflicts with existing port 80 so we can't include the default #} +{# On Ubuntu 16.04 we can include the default config, other versions require explicit config #} +{% if ansible_distribution_version == "16.04" %} +Include /etc/apache2/apache2.conf + +{% else %} Timeout 300 KeepAlive On MaxKeepAliveRequests 100 @@ -25,8 +28,6 @@ IncludeOptional sites-enabled/*conf Require all denied </FilesMatch> -{% else %} -Include /etc/apache2/apache2.conf {% endif %} {% elif ansible_os_family == "FreeBSD" %} diff --git a/test/integration/targets/subversion/vars/Ubuntu-18.yml b/test/integration/targets/subversion/vars/Ubuntu-18.yml new file mode 100644 index 0000000000..dfe131b0e2 --- /dev/null +++ b/test/integration/targets/subversion/vars/Ubuntu-18.yml @@ -0,0 +1,6 @@ +--- +subversion_packages: +- subversion +- libapache2-mod-svn +apache_user: www-data +apache_group: www-data |