From 1ec657956a468e429d2c854dbf6eacc0714c4874 Mon Sep 17 00:00:00 2001
From: Emiliano Vavassori <syntaxerrormmm@gmail.com>
Date: Fri, 3 Jun 2016 11:29:49 +0200
Subject: [PATCH] Using strange addressing to minimize compatibility problems
 on virtual installations.

---
 Vagrantfile                                   |  2 +-
 domain.yml                                    | 16 ++++++++--------
 hosts                                         |  2 +-
 roles/nethcfg/tasks/samba.yml                 |  7 +++++++
 vagrant/roles/rename-nic/tasks/rename-nic.yml |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index f35bb0c..f0248a4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -30,7 +30,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
   # config.vm.network "private_network", ip: "192.168.33.10"
-  config.vm.network "private_network", ip: "192.168.1.1", auto_config: false
+  config.vm.network "private_network", ip: "172.16.254.1", auto_config: false
 
   # Create a public network, which generally matched to bridged network.
   # Bridged networks make the machine appear as another physical device on
diff --git a/domain.yml b/domain.yml
index 88c8939..9e80f7b 100644
--- a/domain.yml
+++ b/domain.yml
@@ -2,15 +2,15 @@
 # Configurazione dominio
 ntpserver: pdc.mastri.edu
 server: pdc
-serverip: 192.168.1.1
+serverip: 172.16.254.1
 servernetmask: 255.255.255.0
-servernet: 192.168.1.0
-servergw: 192.168.1.1
+servernet: 172.16.254.0
+servergw: 172.16.254.1
 serverfqdn: pdc.mastri.edu
 domainshort: MASTRI
 domainfull: mastri.edu
-dhcprange_start: 192.168.1.10
-dhcprange_end: 192.168.1.50
+dhcprange_start: 172.16.254.10
+dhcprange_end: 172.16.254.50
 extdnsserver1: 208.67.222.222
 extdnsserver2: 208.67.220.220
 org_email: info@bglug.it
@@ -20,7 +20,7 @@ org_department: "Laboratorio 1"
 org_city: Caravaggio
 org_phone: "+39 0363 50598"
 org_street: "Via Zenale e Butinone, 20"
-mirror_mode: nfs
-mirror_nfs_share: 192.168.255.1:/var/spool/apt-mirror/mirror
-#remote_mirror: ubuntu.fastbull.org
+mirror_mode: remote
+#mirror_nfs_share: 192.168.255.1:/var/spool/apt-mirror/mirror
+remote_mirror: it.archive.ubuntu.com
 client_gitbranch: master
diff --git a/hosts b/hosts
index d34519c..48a520d 100644
--- a/hosts
+++ b/hosts
@@ -2,4 +2,4 @@
 host_key_checking=false
 
 [server]
-192.168.1.1 ansible_ssh_user=amgmt
+172.16.254.1 ansible_ssh_user=amgmt
diff --git a/roles/nethcfg/tasks/samba.yml b/roles/nethcfg/tasks/samba.yml
index e7946d8..07f4c00 100644
--- a/roles/nethcfg/tasks/samba.yml
+++ b/roles/nethcfg/tasks/samba.yml
@@ -10,6 +10,13 @@
     - nethserver-samba
     - nethserver-samba-audit
 
+# Mitigating bug for upgrade on Badlocks SAMBA bug
+- name: Mitigating bad upgrade for Badlocks
+  shell: yum -y downgrade samba* tdb-tools libtdb libtevent libtalloc pytalloc
+  tags:
+    - badlocks
+    - centos_bug
+
 # SAMBA
 
 - name: Checking SMB configuration
diff --git a/vagrant/roles/rename-nic/tasks/rename-nic.yml b/vagrant/roles/rename-nic/tasks/rename-nic.yml
index c9a7039..5722006 100644
--- a/vagrant/roles/rename-nic/tasks/rename-nic.yml
+++ b/vagrant/roles/rename-nic/tasks/rename-nic.yml
@@ -23,7 +23,7 @@
   become: yes
 
 - name: Creo interfaccia interna in NethServer
-  shell: /sbin/e-smith/db networks set {{ intnic }} ethernet bootproto none device {{ intnic }} hwaddr {{ ansible_eth1.macaddress }} ipaddr 192.168.1.1 netmask 255.255.255.0 onboot yes role green
+  shell: /sbin/e-smith/db networks set {{ intnic }} ethernet bootproto none device {{ intnic }} hwaddr {{ ansible_eth1.macaddress }} ipaddr 172.16.254.1 netmask 255.255.255.0 onboot yes role green
   become: yes
 
 - name: Pulizia vecchia interfaccia interna