diff --git a/domain.yml b/domain.yml index c92dac3..41ee768 100644 --- a/domain.yml +++ b/domain.yml @@ -1,31 +1,25 @@ --- # Configurazione dominio -ntpserver: pdc.topolin.ia +ntpserver: pdc.mastri.edu server: pdc -serverip: 172.16.254.1 +serverip: 192.168.1.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: 192.168.1.0 +servergw: 192.168.1.1 +serverfqdn: pdc.mastri.edu +domainshort: MASTRI +domainfull: mastri.edu +dhcprange_start: 192.168.1.10 +dhcprange_end: 192.168.1.50 extdnsserver1: 208.67.222.222 extdnsserver2: 208.67.220.220 org_email: info@bglug.it -org_company: Accademia di SuperPippo -org_countrycode: IA +org_company: Istituto Comprensivo 'Mastri Caravaggini' +org_countrycode: IT 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: 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: master -#client_gitrepo: "https://github.com/bglug-it/client-pull-installation.git" +org_city: Caravaggio +org_phone: "+39 0363 50598" +org_street: "Via Zenale e Butinone, 20" +mirror_mode: local +#remote_mirror: ubuntu.fastbull.org +client_gitbranch: caravaggio diff --git a/hosts b/hosts index 48a520d..d34519c 100644 --- a/hosts +++ b/hosts @@ -2,4 +2,4 @@ host_key_checking=false [server] -172.16.254.1 ansible_ssh_user=amgmt +192.168.1.1 ansible_ssh_user=amgmt diff --git a/roles/init/tasks/mgmtuser.yml b/roles/init/tasks/mgmtuser.yml index 7624a05..0dcc6c5 100644 --- a/roles/init/tasks/mgmtuser.yml +++ b/roles/init/tasks/mgmtuser.yml @@ -5,7 +5,7 @@ comment: "Ansible Management User" group: wheel state: present - password: $6$mVKMBMbAxeql$eqSe8tu2qKjtwmpiFy07b6nv2g4F80N.U9EzOmQTrNZwKZ61n6NLrSEQHQo1FOlQghOiB8as6Z35oTUUKN8y2. + password: $6$rounds=100000$XvHuMoXtpCksx379$nhlfUn38.oBB7JrDrtwfUisw8T0Bg5InzFq1fw31mcEmGZ2AYFkFK2zC2g04lSfw.kpdSgqH3Dl5q9r1fY6.k. - name: Concessione diritti all'utente di gestione Ansible template: diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed index a8a2d0a..1a21669 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 string $1$33bB/LIt$MEHmvzVIgYRJs/5L4z34L/ # 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 e6341b9..cc5a064 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 string $1$33bB/LIt$MEHmvzVIgYRJs/5L4z34L/ # 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..686b9df 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 $1$33bB/LIt$MEHmvzVIgYRJs/5L4z34L/ # 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..f924ca3 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 $1$33bB/LIt$MEHmvzVIgYRJs/5L4z34L/ # 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 37f0967..a6c0d7a 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 string $1$33bB/LIt$MEHmvzVIgYRJs/5L4z34L/ # Partitioning d-i partman-auto/init_automatically_partition select biggest_free