Commit 2b690fe3 authored by Daniel Salzman's avatar Daniel Salzman

Merge branch 'distro-tests-update' into 'master'

dsitro/tests: add new distros

See merge request !909
parents 7e480e16 c988e0c4
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
Vagrant.configure(2) do |config|
config.vm.box = "fedora/28-cloud-base"
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.define "fedora28_knot-dns" do |machine|
machine.vm.provision "ansible" do |ansible|
ansible.playbook = "../knot-dns-test.yaml"
end
end
end
......@@ -16,7 +16,7 @@
Archlinux: bind-tools
configure_obs_repo:
Fedora: |
dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/Fedora_27/home:CZ-NIC:{{ item }}.repo
dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/Fedora_{{ ansible_distribution_major_version }}/home:CZ-NIC:{{ item }}.repo
CentOS: |
yum install -y wget &&
wget -i wget https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/CentOS_7_EPEL/home:CZ-NIC:{{ item }}.repo -O /etc/yum.repos.d/home:CZ-NIC:{{ item }}.repo
......@@ -26,8 +26,8 @@
apt-key add - < Release.key &&
apt-get update
Ubuntu: |
echo 'deb http://download.opensuse.org/repositories/home:/CZ-NIC:/{{ item }}/xUbuntu_16.04/ /' > /etc/apt/sources.list.d/{{ item }}.list &&
wget -nv https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/xUbuntu_16.04/Release.key -O Release.key &&
echo 'deb http://download.opensuse.org/repositories/home:/CZ-NIC:/{{ item }}/xUbuntu_{{ ansible_distribution_version }}/ /' > /etc/apt/sources.list.d/{{ item }}.list &&
wget -nv https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/xUbuntu_{{ ansible_distribution_version }}/Release.key -O Release.key &&
apt-key add - < Release.key &&
apt-get update
openSUSE Tumbleweed: |
......@@ -73,7 +73,7 @@
- name: configure OBS repository
shell: "{{ configure_obs_repo[ansible_distribution] }}"
with_items: "{{ repos }}"
when: ansible_distribution != 'Archlinux'
when: ansible_distribution_file_variety != 'Archlinux'
- block:
- name: configure OBS repository (Arch)
......@@ -88,7 +88,7 @@
with_items: "{{ repos }}"
- name: sync repos (Arch)
shell: pacman -Syu --noconfirm
when: ansible_distribution == 'Archlinux'
when: ansible_distribution_file_variety == 'Archlinux'
- name: install knot
package:
......
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
Vagrant.configure(2) do |config|
config.vm.box = "generic/ubuntu1804"
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.define "ubuntu1804_knot-dns" do |machine|
machine.vm.provision "ansible" do |ansible|
ansible.playbook = "../knot-dns-test.yaml"
end
end
end
......@@ -4,10 +4,9 @@
#
server:
# Listen on all configured IPv4 interfaces.
listen: 0.0.0.0@53
# Listen on all configured IPv6 interfaces.
listen: ::@53
# Listen on IPv4 and IPv6 localhost
listen: 127.0.0.1@53
listen: ::1@53
# User for running the server.
# user: knot:knot
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment