mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
test subversion - support Ubuntu 18.04 (#50791)
This commit is contained in:
parent
3f70518257
commit
91522bd9c4
3 changed files with 17 additions and 5 deletions
|
@ -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:
|
||||
|
|
|
@ -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" %}
|
||||
|
|
6
test/integration/targets/subversion/vars/Ubuntu-18.yml
Normal file
6
test/integration/targets/subversion/vars/Ubuntu-18.yml
Normal file
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
subversion_packages:
|
||||
- subversion
|
||||
- libapache2-mod-svn
|
||||
apache_user: www-data
|
||||
apache_group: www-data
|
Loading…
Reference in a new issue