From e185eaddfacc3891c1d889568d47d68a41bec984 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Mon, 23 Jan 2017 21:35:29 +0100 Subject: [PATCH 1/5] Commit rebase conflicts. --- domain.yml | 38 +++++++++++++++++++------------------- hosts | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/domain.yml b/domain.yml index c92dac3..13c2a7f 100644 --- a/domain.yml +++ b/domain.yml @@ -1,31 +1,31 @@ --- # Configurazione dominio -ntpserver: pdc.topolin.ia +ntpserver: pdc.liceo.svbg server: pdc -serverip: 172.16.254.1 +serverip: 192.168.3.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.3.0 +servergw: 192.168.3.1 +serverfqdn: pdc.liceo.svbg +domainshort: LICEO +domainfull: liceo.svbg +dhcprange_start: 192.168.3.10 +dhcprange_end: 192.168.3.100 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" -edu_package: secondary -mirror_mode: remote +org_company: Liceo - Seminario Vescovile Giovanni XXIII +org_countrycode: IT +org_department: "Laboratorio Informatica" +org_city: Bergamo +org_phone: "+39 035 28 61 11" +org_street: "Via Arena, 11" +edu_package: tertiary +mirror_mode: local #mirror_nfs_share: 192.168.255.1:/var/spool/apt-mirror/mirror -mirror_host: it.archive.ubuntu.com +mirror_host: archive.ubuntu.com #mirror_path: /ubuntu #mirror_security_host: security.ubuntu.com #mirror_security_path: /ubuntu -client_gitbranch: master +client_gitbranch: liceo.svbg #client_gitrepo: "https://github.com/bglug-it/client-pull-installation.git" diff --git a/hosts b/hosts index 48a520d..b0cec8a 100644 --- a/hosts +++ b/hosts @@ -2,4 +2,4 @@ host_key_checking=false [server] -172.16.254.1 ansible_ssh_user=amgmt +192.168.3.1 ansible_ssh_user=amgmt From 2bc049e79e25232f9a30c0761eadf6ead05b4704 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Fri, 25 Nov 2016 16:35:08 +0100 Subject: [PATCH 2/5] Adding latest fixes for samba and configuration for server. --- domain.yml | 6 ++++-- signed_fixes/samba-downgrade_20161124.sh.gpg | Bin 0 -> 1248 bytes 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 signed_fixes/samba-downgrade_20161124.sh.gpg diff --git a/domain.yml b/domain.yml index 13c2a7f..59dbd99 100644 --- a/domain.yml +++ b/domain.yml @@ -21,11 +21,13 @@ org_city: Bergamo org_phone: "+39 035 28 61 11" org_street: "Via Arena, 11" edu_package: tertiary -mirror_mode: local -#mirror_nfs_share: 192.168.255.1:/var/spool/apt-mirror/mirror +mirror_mode: nfs +mirror_nfs_share: 192.168.3.250:/repo mirror_host: archive.ubuntu.com #mirror_path: /ubuntu #mirror_security_host: security.ubuntu.com #mirror_security_path: /ubuntu client_gitbranch: liceo.svbg #client_gitrepo: "https://github.com/bglug-it/client-pull-installation.git" +apply_fixes: + - samba-downgrade_20161124.sh.gpg diff --git a/signed_fixes/samba-downgrade_20161124.sh.gpg b/signed_fixes/samba-downgrade_20161124.sh.gpg new file mode 100644 index 0000000000000000000000000000000000000000..06ed7d5877badbae97fca06abfa13a1b897f25ff GIT binary patch literal 1248 zcmV<61Rwi_0t^G~doYaG^Xm`+5C3PpOS)s&QIss+IgSs}-?^GdfjZil!7RU_Ej~Ha zHzA(fz6d9GagEqB2d>swL^(u#_6&+{wndSW=r z|E~(UF*|eH7GGW@VWSh^MZ}>_pze!_$&j$+o#D}R2K7mzuu%nAZF@RN$@S^OXeNik z2W2`SGd0nK2Hvx$F53(XSRq(%ggC7xO6mdQK0{zR>v8|9EJV}Aci}u=QI-=;6=MSj zQ%^dxJ{@K8^V$8(9IID;7EriSK@u1^xtt<-qj6p=I@MM@95QTQgckfNj@-aYHJnd< z?3=)yP6}`dK`KHe#v?}f)G*BpO4?OpK14!ql|E~9q8YFJKG!@9k-TpnNJXnG*0>~z zY7Jjy&U3_9bYGq|scB4$>b2K|&U@Op=0s|;dLv|svmWSs7d}YB#rTe40sLER zZ;0q3V>Y`#vWs?KlOCRKKO&a}5lN86UO2bxqG|^T)w^Tdvq(mQFR2O|g8vLDZ+&P~ ztTDMKYhalHOy+@2Ca{by1P22Go?Gckhu{WiVA6%p`(da_)gbUxkV*m8cYq=d@a*T% zf515u1U#+%>h;p;0a!{7u5|7p8=S(23FjS^uRS-0E%CdYtbd^8a#t%`VQK{e1Xs{n znU=;OiIX~yg!X%fNg&f<#ct28lQF@Hp0g!i5SFzk6KUQ>16+YpNqm?+r9Ss6GSAQv zmX0D;L1>CGg>EraD9%-qUQ`oUkwVCq8!WT4NilNw5R>gjo5j%*#j^ZOzm+^zw|j%9 z{i*05`8XcVQV*&wARQ=};U?$%rr1ewfEy5`aHcr&eO|AhF~tJcV=>)EtiF^u^Vg_Jk>s)6W!{u+Q=V?PSF7 zAfW{9Fl%rnEfe@C_K$QXCd3M3uioM3;!)`;i|<&L`oBNjO3?yQ9cRUK`ey1scO<(aV_ zohN(ulB9dR(JCS#sUhu~brzX+{)eMW;+*r1Fm20+J$mzkp(g5Z-j$*Cb0vI`6Imdx z&XxM@xp;;4ZxQW|k3_N_j)SuZkUsJ<-tdn|i)PE~VgISm|5x=<+Bbja9VCy;koyp( K9Bu$E39olxfMKTq literal 0 HcmV?d00001 From 8d92762a240076e84ff624b6b12e774f6c0e7946 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 17 Jan 2017 23:00:01 +0100 Subject: [PATCH 3/5] Fixing templates-custom. --- signed_fixes/samba-downgrade_20161124.sh | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 signed_fixes/samba-downgrade_20161124.sh diff --git a/signed_fixes/samba-downgrade_20161124.sh b/signed_fixes/samba-downgrade_20161124.sh new file mode 100644 index 0000000..89216cf --- /dev/null +++ b/signed_fixes/samba-downgrade_20161124.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +# Define a fix name. This will be used to check if the fix was already +# applied. +name=samba-downgrade_20161124.sh + +# If already applied, skip +if [[ -f "/var/lib/topolin.ia/fixes/${name}.done" ]]; then + echo "Already fixed with ${name}. Skipping." + exit 0 +fi + +# Make the required modifications. + +export DEBIAN_FRONTEND=noninteractive +apt-get install -q -y --force-yes \ +-o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \ +libsmbclient=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +python-samba=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +samba=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +samba-common=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +samba-common-bin=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +samba-dsdb-modules=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +samba-libs=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +samba-vfs-modules=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +smbclient=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +libnss-winbind=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +libpam-winbind=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +libwbclient0=2:4.3.11+dfsg-0ubuntu0.14.04.1 \ +winbind=2:4.3.11+dfsg-0ubuntu0.14.04.1 + +pkglist="libsmbclient python-samba samba-common samba-common-bin samba-dsdb-modules samba-libs samba-vfs-modules smbclient libnss-winbind libpam-winbind libwbclient0" + +for pkg in ${pkglist}; do + apt-mark auto ${pkg} + apt-mark hold ${pkg} +done + +# Once modified the system, ensure to create a check file to skip and not run +# it again if not needed. +mkdir -p /var/lib/topolin.ia/fixes +echo "$(date --iso | tr -d '-')" > /var/lib/topolin.ia/fixes/${name}.done From 4014ceeaa8de639de1dcaa86507c45a1e197a3ab Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Wed, 22 Feb 2017 01:08:51 +0100 Subject: [PATCH 4/5] Realigning passwords for liceo.svbg. --- roles/init/tasks/mgmtuser.yml | 2 +- roles/preseed/templates/preseed/aula-trusty.seed | 2 +- roles/preseed/templates/preseed/client-trusty.seed | 2 +- roles/preseed/templates/preseed/dev/client-trusty.seed | 2 +- roles/preseed/templates/preseed/dev/docenti-trusty.seed | 2 +- roles/preseed/templates/preseed/docenti-trusty.seed | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 From 9a2522357bff0148c1e901daa688dd7d78a673c7 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Fri, 8 Sep 2017 16:52:24 +0200 Subject: [PATCH 5/5] Correzione firma geogebra. Correzione punto di mountaggio NFS e tipo. --- roles/preseed/tasks/repoconfig.yml | 6 ++++++ roles/preseed/templates/preseed/aula-trusty.seed | 2 +- roles/preseed/templates/preseed/client-trusty.seed | 2 +- roles/preseed/templates/preseed/docenti-trusty.seed | 2 +- roles/ubuntu-mirror/tasks/nfs-mirror.yml | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/roles/preseed/tasks/repoconfig.yml b/roles/preseed/tasks/repoconfig.yml index 3fcad32..aeeafe5 100644 --- a/roles/preseed/tasks/repoconfig.yml +++ b/roles/preseed/tasks/repoconfig.yml @@ -35,3 +35,9 @@ - epoptes-ppa-trusty.list - geogebra-stable.list become: yes + +- name: Scarico firma per geogebra + get_url: + url: "https://www.geogebra.net/linux/office@geogebra.org.gpg.key" + dest: "/var/lib/nethserver/ibay/ks/repoconfig/office_geogebra.gpg.key" + become: yes diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed index 1a21669..8bb4f5a 100644 --- a/roles/preseed/templates/preseed/aula-trusty.seed +++ b/roles/preseed/templates/preseed/aula-trusty.seed @@ -55,7 +55,7 @@ d-i apt-setup/local2/key string http://keyserver.ubuntu.com:11371/pks/lookup # Setup and enable geogebra repository d-i apt-setup/local3/repository string http://{{ execpath }}/www.geogebra.net/linux stable main d-i apt-setup/local3/comment string Geogebra Official repository -d-i apt-setup/local3/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new +d-i apt-setup/local3/key string http://{{ ansible_local.domain.serverfqdn }}/ks/repoconfig/office_geogebra.gpg.key # Time and date d-i clock-setup/utc boolean true diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed index cc5a064..18942ec 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -55,7 +55,7 @@ d-i apt-setup/local2/key string http://keyserver.ubuntu.com:11371/pks/lookup # Setup and enable geogebra repository d-i apt-setup/local3/repository string http://{{ execpath }}/www.geogebra.net/linux stable main d-i apt-setup/local3/comment string Geogebra Official repository -d-i apt-setup/local3/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new +d-i apt-setup/local3/key string http://{{ ansible_local.domain.serverfqdn }}/ks/repoconfig/office_geogebra.gpg.key # Time and date d-i clock-setup/utc boolean true diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed index a6c0d7a..9d7d569 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -55,7 +55,7 @@ d-i apt-setup/local2/key string http://keyserver.ubuntu.com:11371/pks/lookup # Setup and enable geogebra repository d-i apt-setup/local3/repository string http://{{ execpath }}/www.geogebra.net/linux stable main d-i apt-setup/local3/comment string Geogebra Official repository -d-i apt-setup/local3/key string http://www.geogebra.net/linux/office@geogebra.org.gpg.key.new +d-i apt-setup/local3/key string http://{{ ansible_local.domain.serverfqdn }}/ks/repoconfig/office_geogebra.gpg.key # Time and date d-i clock-setup/utc boolean true diff --git a/roles/ubuntu-mirror/tasks/nfs-mirror.yml b/roles/ubuntu-mirror/tasks/nfs-mirror.yml index 26fa5f1..388c7d0 100644 --- a/roles/ubuntu-mirror/tasks/nfs-mirror.yml +++ b/roles/ubuntu-mirror/tasks/nfs-mirror.yml @@ -28,9 +28,9 @@ - name: Adding mountpoint to fstab lineinfile: dest: /etc/fstab - line: "{{ ansible_local.domain.mirror_nfs_share }} /var/spool/apt-mirror/mirror nfs4 defaults 0 0" + line: "{{ ansible_local.domain.mirror_nfs_share }} /var/spool/apt-mirror nfs defaults 0 0" when: chk_mount_nfs|changed - name: Mounting share - shell: mount /var/spool/apt-mirror/mirror + shell: mount /var/spool/apt-mirror when: chk_mount_nfs|changed