Merge branch 'master' of gitlab.altinea.fr:altinea/install-scripts

foreman/altinea_puppet_install.sh

@@ -1,10 +1,9 @@
 #!/bin/sh
 
-apt install -y lsb-release curl && curl -sL -o /var/cache/apt/archives/puppet6-release-`lsb_release -c -s`.deb https://apt.puppet.com/puppet6-release-`lsb_release -c -s`.deb && dpkg -i /var/cache/apt/archives/puppet6-release-`lsb_release -c -s`.deb && apt update && apt install -y puppet-agent && apt clean
+apt install -y lsb-release curl && curl -sL -o /var/cache/apt/archives/puppet7-release-`lsb_release -c -s`.deb https://apt.puppet.com/puppet7-release-`lsb_release -c -s`.deb && dpkg -i /var/cache/apt/archives/puppet7-release-`lsb_release -c -s`.deb && apt update && apt install -y puppet-agent && apt clean
 echo "[agent]
   server = foreman.altinea.fr
   runinterval = 600
-  environment = production
   listen = false
   pluginsync = true
   report = true"> /etc/puppetlabs/puppet/puppet.conf

wireguard/deploy-wg-clients.sh

@@ -52,6 +52,6 @@ read -n1 -r -p "Press space only AFTER configuration is done ..."
 systemctl enable wg-quick@vpnaltinea.service && systemctl daemon-reload && systemctl start wg-quick@vpnaltinea
 
 # Run a ping to make the interface usable
-ping -c1 192.168.25.1
+ping -c1 10.17.25.1
 
 exit 0;