From 69e676027c1156fb27aab97b69cad94bf155d3e5 Mon Sep 17 00:00:00 2001 From: sio Date: Wed, 6 Jan 2021 09:49:04 +0100 Subject: [PATCH 1/7] adapt pull-config pout gitea distant --- pull-config | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pull-config b/pull-config index 25d4cd1..5429d4d 100644 --- a/pull-config +++ b/pull-config @@ -1,24 +1,21 @@ #!/bin/bash +if [ -z ${UREP+x} ]; then + UREP=https://gitea.lyc-lecastel.fr/gadmin/gsb2021.git +fi +REPO=$(basename ${UREP}) + dir=/root/tools/ansible host=depl hostf=$host.sio.lan -repo=gsb -[ -e $dir ] || mkdir -p $dir +[ -e ${dir} ] || mkdir -p ${dir} -grep $hostf /etc/hosts > /dev/null || echo "10.121.38.10 $hostf $host" >> /etc/hosts +#grep $hostf /etc/hosts > /dev/null || echo "10.121.38.10 $hostf $host" >> /etc/hosts -cd $dir +cd ${dir} hostname > hosts - -#git clone http://$host/$repo.git - -cd $repo -git pull - -ansible-playbook -c local -i 'localhost,' $(hostname).yml -#ansible-pull -i $dir/hosts -d $repo -U http://$host/$repo.git +ansible-pull -i ${dir}/hosts -U "${UREP}" exit 0 From 73c5d2a95280647320bb97e538b1102a27600e9d Mon Sep 17 00:00:00 2001 From: tl Date: Wed, 6 Jan 2021 11:32:38 +0100 Subject: [PATCH 2/7] adapt s-proxy.yml bugs divers --- goss/s-proxy.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/goss/s-proxy.yaml b/goss/s-proxy.yaml index 5f4cc9b..acbc953 100644 --- a/goss/s-proxy.yaml +++ b/goss/s-proxy.yaml @@ -2,7 +2,7 @@ package: squid: installed: true addr: - tcp://192.168.99.99:8080: + tcp://192.168.99.99:8080: reachable: true timeout: 500 port: @@ -10,6 +10,7 @@ port: listening: true ip: - '::' +service: squid: enabled: true running: true @@ -24,19 +25,17 @@ interface: enp0s3: exists: true addrs: - - 192.168.99.1/24 - enp0s8 - exists: true - addrs: - - 192.168.99.1/24 + - 192.168.99.2/24 + mtu: 1500 enp0s8: - exists: true + exists: true addrs: - - 172.16.0.1/24 + - 172.16.0.2/24 + mtu: 1500 http: http://localhost/wpad.dat: status: 200 allow-insecure: false no-follow-redirects: false timeout: 5000 - body: [] + body: [] From e1ea414dd27bb7bd486fba43a2849c198f764252 Mon Sep 17 00:00:00 2001 From: gadmin Date: Wed, 6 Jan 2021 12:00:28 +0100 Subject: [PATCH 3/7] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ae5c03e..c3ab674 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,25 @@ # gsb2021 -Environnement et playbooks ansible pour le projet GSB 2021 \ No newline at end of file +Environnement et playbooks ansible pour le projet GSB 2021 + +## Les machines + * s-adm + * s-infra + * r-int + * r-ext + * s-proxy +## Les playbooks +Bonjour Olivier, + +Pour les SIO2, les semaines concernées pour les CCF sont : + + +CCF E6 : du lundi 26 avril 2021 au vendredi 30 avril 2021 (temps d'interrogation augmenté de 20 mn pour les "engagement citoyen". + +CCF E4 : du lundi 7 juin 2021 au vendredi 12 juin 2021, + + +sous condition de candidats isolés supplémentaires proposés par le rectorat. + + +Bonne année 2021. Cordialement. \ No newline at end of file From 7a655af2f2fbb3b7add15058d1675e8c9f706815 Mon Sep 17 00:00:00 2001 From: gadmin Date: Wed, 6 Jan 2021 12:01:06 +0100 Subject: [PATCH 4/7] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/README.md b/README.md index c3ab674..497a88e 100644 --- a/README.md +++ b/README.md @@ -9,17 +9,3 @@ Environnement et playbooks ansible pour le projet GSB 2021 * r-ext * s-proxy ## Les playbooks -Bonjour Olivier, - -Pour les SIO2, les semaines concernées pour les CCF sont : - - -CCF E6 : du lundi 26 avril 2021 au vendredi 30 avril 2021 (temps d'interrogation augmenté de 20 mn pour les "engagement citoyen". - -CCF E4 : du lundi 7 juin 2021 au vendredi 12 juin 2021, - - -sous condition de candidats isolés supplémentaires proposés par le rectorat. - - -Bonne année 2021. Cordialement. \ No newline at end of file From 5c44880bf619c9abf235529c108cf65627b8dd98 Mon Sep 17 00:00:00 2001 From: gadmin Date: Wed, 6 Jan 2021 12:03:17 +0100 Subject: [PATCH 5/7] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 497a88e..d774e37 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ Environnement et playbooks ansible pour le projet GSB 2021 +## Quickstart +prérequis : une machine Debian buster + + ## Les machines * s-adm * s-infra From ffbfc1c6c70d16682929c010cdcc507f2b5e59e8 Mon Sep 17 00:00:00 2001 From: phil Date: Wed, 6 Jan 2021 22:11:28 +0100 Subject: [PATCH 6/7] ajout role local-store + pbook s-adm --- roles/local-store/files/getall-2021 | 24 ++++++++++++++++++++++++ roles/local-store/files/getall-latest | 24 ++++++++++++++++++++++++ roles/local-store/tasks/main.yml | 18 ++++++++++++++++++ s-adm.yml | 2 +- 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 roles/local-store/files/getall-2021 create mode 100644 roles/local-store/files/getall-latest create mode 100644 roles/local-store/tasks/main.yml diff --git a/roles/local-store/files/getall-2021 b/roles/local-store/files/getall-2021 new file mode 100644 index 0000000..d9a0697 --- /dev/null +++ b/roles/local-store/files/getall-2021 @@ -0,0 +1,24 @@ +#!/bin/bash +GLPIREL=9.5.3 +wget -nc https://github.com/glpi-project/glpi/releases/download/${GLPIREL}/glpi-${GLPIREL}.tgz + +FIREL=9.5+1.0 +wget -nc https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi${FIREL}/fusioninventory-${FIREL}.tar.gz +#https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi9.5.0%2B1.0/fusioninventory-9.5.0+1.0.tar.bz2 + +FIAGREL=2.5.2 +wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/${FIAGREL}/fusioninventory-agent_windows-x64_${FIAGREL}.exe + +wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/${FIAGREL}/fusioninventory-agent_windows-x86_${FIAGREL}.exe + +FOGREL=1.5.9 +wget -nc https://github.com/FOGProject/fogproject/archive/${FOGREL}.tar.gz -O fogproject-${FOGREL}.tar.gz +#https://github.com/FOGProject/fogproject/archive/1.5.9.tar.gz + +#wget -nc https://fr.wordpress.org/wordpress-5.3.2-fr_FR.tar.gz +wget -nc https://fr.wordpress.org/wordpress-5.6-fr_FR.tar.gz + +GOSSVER=v0.3.16 +curl -L https://github.com/aelsabbahy/goss/releases/download/${GOSSVER}/goss-linux-amd64 -o goss +chmod +x goss + diff --git a/roles/local-store/files/getall-latest b/roles/local-store/files/getall-latest new file mode 100644 index 0000000..d9a0697 --- /dev/null +++ b/roles/local-store/files/getall-latest @@ -0,0 +1,24 @@ +#!/bin/bash +GLPIREL=9.5.3 +wget -nc https://github.com/glpi-project/glpi/releases/download/${GLPIREL}/glpi-${GLPIREL}.tgz + +FIREL=9.5+1.0 +wget -nc https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi${FIREL}/fusioninventory-${FIREL}.tar.gz +#https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi9.5.0%2B1.0/fusioninventory-9.5.0+1.0.tar.bz2 + +FIAGREL=2.5.2 +wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/${FIAGREL}/fusioninventory-agent_windows-x64_${FIAGREL}.exe + +wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/${FIAGREL}/fusioninventory-agent_windows-x86_${FIAGREL}.exe + +FOGREL=1.5.9 +wget -nc https://github.com/FOGProject/fogproject/archive/${FOGREL}.tar.gz -O fogproject-${FOGREL}.tar.gz +#https://github.com/FOGProject/fogproject/archive/1.5.9.tar.gz + +#wget -nc https://fr.wordpress.org/wordpress-5.3.2-fr_FR.tar.gz +wget -nc https://fr.wordpress.org/wordpress-5.6-fr_FR.tar.gz + +GOSSVER=v0.3.16 +curl -L https://github.com/aelsabbahy/goss/releases/download/${GOSSVER}/goss-linux-amd64 -o goss +chmod +x goss + diff --git a/roles/local-store/tasks/main.yml b/roles/local-store/tasks/main.yml new file mode 100644 index 0000000..1dc1ae9 --- /dev/null +++ b/roles/local-store/tasks/main.yml @@ -0,0 +1,18 @@ +--- + +- name: Installation bind9 + file: + path: /var/www/html/gsbstore/ + state: directory + mode: '0755' + +- name: Copie getall-latest + copy: + src: getall-latest + dest: /var/www/html/gsbstore + +- name: Copie getall-2021 + copy: + src: getall-2021 + dest: /var/www/html/gsbstore + diff --git a/s-adm.yml b/s-adm.yml index 169c8c1..b6a0e7b 100644 --- a/s-adm.yml +++ b/s-adm.yml @@ -8,7 +8,7 @@ - s-ssh - dnsmasq - squid - # - webautoconf + - local-store - snmp-agent - syslog-cli - post From cc31f5da3bb52b83f522cfaa7ec1df5681937035 Mon Sep 17 00:00:00 2001 From: bb Date: Thu, 7 Jan 2021 14:55:33 +0100 Subject: [PATCH 7/7] commentaire postfix-fk --- s-mon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s-mon.yml b/s-mon.yml index e9b2915..128047c 100644 --- a/s-mon.yml +++ b/s-mon.yml @@ -6,7 +6,7 @@ - base - goss - icinga-fk - - postfix-fk +# - postfix-fk - ssh-cli - syslog - post