diff --git a/group_vars/all b/group_vars/all index a33100b..59d25d4 100644 --- a/group_vars/all +++ b/group_vars/all @@ -20,7 +20,7 @@ common_rsyslog: True common_openssh_permit_root_login: "yes" common_resolvconf: True -common_resolvconf_nameservers: ["10.0.3.1", "192.168.86.1"] +common_resolvconf_nameservers: ["192.168.86.1"] common_resolvconf_search: ["fet.htu.tuwien.ac.at"] common_resolvconf_domain: "fet.htu.tuwien.ac.at" nocows: True diff --git a/host_vars/ariane b/host_vars/ariane index e33661f..bad399d 100644 --- a/host_vars/ariane +++ b/host_vars/ariane @@ -2,7 +2,8 @@ inventory_hostname: ariane.fet.htu.tuwien.ac.at inventory_hostname_short: ariane -common_interfaces: interfaces_ariane.j2 +common_interfaces: True +common_interfaces_file: interfaces_ariane.j2 common_iptables_v4: "iptables_ariane_v4.j2" common_iptables_v6: "iptables_ariane_v6.j2" diff --git a/host_vars/progress b/host_vars/progress index 9551b87..e75b5ce 100644 --- a/host_vars/progress +++ b/host_vars/progress @@ -3,4 +3,4 @@ inventory_hostname_short: progress common_iptables_v4: "iptables_progress_v4.j2" common_iptables_v6: "iptables_progress_v6.j2" -printer_ip: 192.168.86.14 +printer_ip: dell3465 diff --git a/roles/ariane/tasks/lxc.yml b/roles/ariane/tasks/lxc.yml index 88ddb1c..d6a6f59 100644 --- a/roles/ariane/tasks/lxc.yml +++ b/roles/ariane/tasks/lxc.yml @@ -14,7 +14,7 @@ - name: lxc - /etc/default/lxc-net copy: dest: /etc/default/lxc-net - content: 'USE_LXC_BRIDGE="true"' + content: 'USE_LXC_BRIDGE="false"' owner: root group: root mode: 0644 diff --git a/roles/common b/roles/common index e124771..4202214 160000 --- a/roles/common +++ b/roles/common @@ -1 +1 @@ -Subproject commit e124771d06615560d827b1baf7feb6a616a8dca4 +Subproject commit 4202214cd954043989c0aa2c7cbf4f013c11ed5a diff --git a/roles/scans/tasks/samba.yml b/roles/scans/tasks/samba.yml index 66b0e6f..4d96a24 100644 --- a/roles/scans/tasks/samba.yml +++ b/roles/scans/tasks/samba.yml @@ -5,7 +5,7 @@ - samba - name: samba - /etc/smb.conf - template: dest=/etc/smb.conf src=smb.conf.j2 owner=root group=root mode=0644 + template: dest=/etc/samba/smb.conf src=smb.conf.j2 owner=root group=root mode=0644 notify: restart samba - name: samba - create users group diff --git a/roles/scans/templates/smb.conf.j2 b/roles/scans/templates/smb.conf.j2 index 0ac3ea9..83b99f9 100644 --- a/roles/scans/templates/smb.conf.j2 +++ b/roles/scans/templates/smb.conf.j2 @@ -6,7 +6,6 @@ server string = PROGRESS security = user - hosts allow = 192.168.86.14 log file = /var/log/samba/%m.log max log size = 500 diff --git a/templates/interfaces_ariane.j2 b/templates/interfaces_ariane.j2 index b80f6ab..95cdc13 100644 --- a/templates/interfaces_ariane.j2 +++ b/templates/interfaces_ariane.j2 @@ -9,11 +9,9 @@ allow-hotplug enp8s0 iface enp8s0 inet dhcp auto br0 -iface br0 inet dhcp +iface br0 inet manual bridge_ports enp9s0 bridge_fd 0 bridge_maxwait 0 dns-nameservers 192.168.86.1 -#dns-nameservers 192.168.86.1 10.0.3.1 -#dns-nameserver 10.0.3.1