diff --git a/roles/nethcfg/defaults/main.yml b/roles/nethcfg/defaults/main.yml index 0c219ff..e8d68ba 100644 --- a/roles/nethcfg/defaults/main.yml +++ b/roles/nethcfg/defaults/main.yml @@ -1,5 +1,4 @@ --- -extnic: wan0 intnic: lan0 force_regen_ca: false force_ibay_shared: false diff --git a/roles/nethcfg/tasks/network.yml b/roles/nethcfg/tasks/network.yml index e8ffb29..f595f76 100644 --- a/roles/nethcfg/tasks/network.yml +++ b/roles/nethcfg/tasks/network.yml @@ -1,9 +1,6 @@ --- # Reconfiguring network interfaces -- name: Configuring external NIC - shell: /sbin/e-smith/db networks setprop {{ extnic }} role red bootproto dhcp - - name: Configuring internal NIC shell: /sbin/e-smith/db networks setprop {{ intnic }} role green ipaddr {{ ansible_local.domain.serverip }} netmask {{ ansible_local.domain.servernetmask }} diff --git a/roles/preseed/templates/preseed/dev/client-trusty.seed b/roles/preseed/templates/preseed/dev/client-trusty.seed index 1fb766c..0851587 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$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 5bc717e..63676d0 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$K8JQcf/LF$BiEHLimL5qsiPeOx/xfdV/uzvS4lSlo/sN5L2b.5QE93XkejiReKOMqS8nr0Who5tw5Imsn522vzF6QdrJJLb/ # Partitioning d-i partman-auto/init_automatically_partition select biggest_free