From 965f7c90c4f579d7d2c76508e20653c6632b2028 Mon Sep 17 00:00:00 2001
From: Emiliano Vavassori <syntaxerrormmm@gmail.com>
Date: Wed, 25 Oct 2017 00:03:10 +0200
Subject: [PATCH] Revert "Salerno3.ilariaalpi: Realigning repo and production
 code."

---
 domain.yml                                    | 36 +++++++++----------
 hosts                                         |  2 +-
 roles/nethcfg/tasks/samba.yml                 |  4 +--
 .../templates/preseed/aula-trusty.seed        |  2 +-
 .../templates/preseed/client-trusty.seed      |  2 +-
 .../templates/preseed/dev/client-trusty.seed  |  2 +-
 .../templates/preseed/dev/docenti-trusty.seed |  2 +-
 .../templates/preseed/docenti-trusty.seed     |  2 +-
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/domain.yml b/domain.yml
index 945f993..c92dac3 100644
--- a/domain.yml
+++ b/domain.yml
@@ -1,31 +1,31 @@
 ---
 # Configurazione dominio
-ntpserver: pdc.salerno3.ilariaalpi.edu
+ntpserver: pdc.topolin.ia
 server: pdc
-serverip: 192.168.5.1
+serverip: 172.16.254.1
 servernetmask: 255.255.255.0
-servernet: 192.168.5.0
-servergw: 192.168.5.1
-serverfqdn: pdc.salerno3.ilariaalpi.edu
-domainshort: SALERNO3
-domainfull: salerno3.ilariaalpi.edu
-dhcprange_start: 192.168.5.10
-dhcprange_end: 192.168.5.60
+servernet: 172.16.254.0
+servergw: 172.16.254.1
+serverfqdn: pdc.topolin.ia
+domainshort: TOPOLIN
+domainfull: topolin.ia
+dhcprange_start: 172.16.254.10
+dhcprange_end: 172.16.254.50
 extdnsserver1: 208.67.222.222
 extdnsserver2: 208.67.220.220
-org_email: miic8dz008@istruzione.it
-org_company: Istituto Comprensivo Ilaria Alpi
-org_countrycode: IT
-org_department: "Laboratorio 1 - via Salerno, 3"
-org_city: Milano
-org_phone: 02 88444696
-org_street: Via Salerno, 3
+org_email: info@bglug.it
+org_company: Accademia di SuperPippo
+org_countrycode: IA
+org_department: "Laboratorio 1"
+org_city: Topolinia
+org_phone: "313 113 176-167"
+org_street: "Piazza la bomba e scappa"
 edu_package: secondary
-mirror_mode: local
+mirror_mode: remote
 #mirror_nfs_share: 192.168.255.1:/var/spool/apt-mirror/mirror
 mirror_host: it.archive.ubuntu.com
 #mirror_path: /ubuntu
 #mirror_security_host: security.ubuntu.com
 #mirror_security_path: /ubuntu
-client_gitbranch: ilariaalpi
+client_gitbranch: master
 #client_gitrepo: "https://github.com/bglug-it/client-pull-installation.git"
diff --git a/hosts b/hosts
index e62cc45..48a520d 100644
--- a/hosts
+++ b/hosts
@@ -2,4 +2,4 @@
 host_key_checking=false
 
 [server]
-172.16.99.22 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 de3baf8..a0fcd1c 100644
--- a/roles/nethcfg/tasks/samba.yml
+++ b/roles/nethcfg/tasks/samba.yml
@@ -13,7 +13,7 @@
 
 # SAMBA
 
-- name: Verifying modifications on templates-custom.
+- name: "Verifying modifications on templates-custom."
   shell: grep -q 'server signing = mandatory' /etc/e-smith/templates-custom/etc/samba/smb.conf/10global
   register: check_tempcust
   changed_when: check_tempcust.rc != 0
@@ -21,7 +21,7 @@
 
 - name: "Create directory structure for templates-custom"
   file:
-    path: /etc/e-smith/templates-custom/etc/samba/smb.conf
+    path: "/etc/e-smith/templates-custom/etc/samba/smb.conf"
     owner: root
     group: root
     mode: 0755
diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed
index 26bac4c..5e64442 100644
--- a/roles/preseed/templates/preseed/aula-trusty.seed
+++ b/roles/preseed/templates/preseed/aula-trusty.seed
@@ -66,7 +66,7 @@ d-i	clock-setup/ntp-server			string {{ ansible_local.domain.ntpserver }}
 # User creation
 d-i	passwd/user-fullname			string BgLUG User
 d-i	passwd/username				string bglug
-d-i	passwd/user-password-crypted		password $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/
+d-i	passwd/user-password-crypted		password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./
 
 # Partitioning
 d-i	partman-auto/init_automatically_partition	select biggest_free
diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed
index c776024..5d04438 100644
--- a/roles/preseed/templates/preseed/client-trusty.seed
+++ b/roles/preseed/templates/preseed/client-trusty.seed
@@ -66,7 +66,7 @@ d-i	clock-setup/ntp-server			string {{ ansible_local.domain.ntpserver }}
 # User creation
 d-i	passwd/user-fullname			string BgLUG User
 d-i	passwd/username				string bglug
-d-i	passwd/user-password-crypted		password $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/
+d-i	passwd/user-password-crypted		password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./
 
 # Partitioning
 d-i	partman-auto/init_automatically_partition	select biggest_free
diff --git a/roles/preseed/templates/preseed/dev/client-trusty.seed b/roles/preseed/templates/preseed/dev/client-trusty.seed
index 1fb766c..ae50a40 100644
--- a/roles/preseed/templates/preseed/dev/client-trusty.seed
+++ b/roles/preseed/templates/preseed/dev/client-trusty.seed
@@ -62,7 +62,7 @@ d-i	clock-setup/ntp-server			string {{ ansible_local.domain.ntpserver }}
 # User creation
 d-i	passwd/user-fullname			string BgLUG User
 d-i	passwd/username				string bglug
-d-i	passwd/user-password-crypted		string $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/
+d-i	passwd/user-password-crypted		password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./
 
 # Partitioning
 d-i	partman-auto/init_automatically_partition	select biggest_free
diff --git a/roles/preseed/templates/preseed/dev/docenti-trusty.seed b/roles/preseed/templates/preseed/dev/docenti-trusty.seed
index 5bc717e..c9ea221 100644
--- a/roles/preseed/templates/preseed/dev/docenti-trusty.seed
+++ b/roles/preseed/templates/preseed/dev/docenti-trusty.seed
@@ -62,7 +62,7 @@ d-i	clock-setup/ntp-server			string {{ ansible_local.domain.ntpserver }}
 # User creation
 d-i	passwd/user-fullname			string BgLUG User
 d-i	passwd/username				string bglug
-d-i	passwd/user-password-crypted		string $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/
+d-i	passwd/user-password-crypted		password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./
 
 # Partitioning
 d-i	partman-auto/init_automatically_partition	select biggest_free
diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed
index faf53d4..5624bbc 100644
--- a/roles/preseed/templates/preseed/docenti-trusty.seed
+++ b/roles/preseed/templates/preseed/docenti-trusty.seed
@@ -66,7 +66,7 @@ d-i	clock-setup/ntp-server			string {{ ansible_local.domain.ntpserver }}
 # User creation
 d-i	passwd/user-fullname			string BgLUG User
 d-i	passwd/username				string bglug
-d-i	passwd/user-password-crypted		password $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/
+d-i	passwd/user-password-crypted		password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./
 
 # Partitioning
 d-i	partman-auto/init_automatically_partition	select biggest_free