adapt s-proxy.yml bugs divers

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: []

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