From 34a5b4604f5b593c15affe8a84371e4cb067d2f9 Mon Sep 17 00:00:00 2001 From: leopoldotosi Date: Thu, 7 Jun 2018 14:27:46 +0200 Subject: [PATCH] Modifications for IC Alpi - San Colombano Lab. --- .gitignore | 1 + domain.yml | 36 +++++++++---------- hosts | 2 +- .../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, 25 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index d69e568..8f3b3da 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.box .vagrant/* *.patch +*.retry diff --git a/domain.yml b/domain.yml index c92dac3..344c3ff 100644 --- a/domain.yml +++ b/domain.yml @@ -1,31 +1,31 @@ --- # Configurazione dominio -ntpserver: pdc.topolin.ia +ntpserver: pdc.sancolombano.ilariaalpi.edu server: pdc -serverip: 172.16.254.1 +serverip: 172.16.14.1 servernetmask: 255.255.255.0 -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 +servernet: 172.16.14.0 +servergw: 172.16.14.1 +serverfqdn: pdc.sancolombano.ilariaalpi.edu +domainshort: SANCOLOMBANO +domainfull: sancolombano.ilariaalpi.edu +dhcprange_start: 172.16.14.15 +dhcprange_end: 172.16.14.60 extdnsserver1: 208.67.222.222 extdnsserver2: 208.67.220.220 -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" +org_email: miic8dz008@istruzione.it +org_company: Istituto Comprensivo Ilaria Alpi +org_countrycode: IT +org_department: "Laboratorio SC - via sancolombano 8" +org_city: Milano +org_phone: 0288444696 +org_street: Via sancolombano 8 edu_package: secondary mirror_mode: remote -#mirror_nfs_share: 192.168.255.1:/var/spool/apt-mirror/mirror +#mirror_nfs_share: 172.16.14.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: master +client_gitbranch: ilariaalpi #client_gitrepo: "https://github.com/bglug-it/client-pull-installation.git" diff --git a/hosts b/hosts index 48a520d..3c19b23 100644 --- a/hosts +++ b/hosts @@ -2,4 +2,4 @@ host_key_checking=false [server] -172.16.254.1 ansible_ssh_user=amgmt +172.16.14.1 ansible_ssh_user=amgmt diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed index 5e64442..26bac4c 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$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ +d-i passwd/user-password-crypted password $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/ # 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 5d04438..c776024 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$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ +d-i passwd/user-password-crypted password $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/ # 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 ae50a40..1fb766c 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 password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ +d-i passwd/user-password-crypted string $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/ # 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 c9ea221..5bc717e 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 password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ +d-i passwd/user-password-crypted string $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/ # 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 5624bbc..faf53d4 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$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ +d-i passwd/user-password-crypted password $6$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/ # Partitioning d-i partman-auto/init_automatically_partition select biggest_free