Merge branch 'master' of https://gitea.lyc-lecastel.fr/uap33-r/onfarbo

script/restauration/rest43

@@ -1,26 +1,53 @@
 #!/bin/bash
 HOST=root@onfarbo43
-restore () {
+
-ssh "${HOST}" "mysql -u ap45 -pAzerty1+ bdarbre" < bdarbre43.sql
+usage() { 
+echo -e "Usage: $0 [-f] <compressed dumpfile>\n\t-f: force mode\n\t-h: this help\n" 1>&2; exit 1; }
+
+restore() {
+	zcat "${filename}" | ssh "${HOST}"  "mysql -u ap43 -pAzerty1+ bdarbre" 
 }
-while getopts "f" OPT
-do
-    case "${OPT}" in
-      f)
-          restore
-          exit 0;
-          ;;
-    esac
-done
 
 confirm() {
     read -r -n 1 -p "${1:-Confirmer?} [o/n]: " REPLY
-    case $REPLY in
+    case "${REPLY}" in
       [oO]) echo ; restore ;;
       [nN]) echo ; exit 1 ;;
       *) printf " \033[31m %s \n\033[0m" "Entrée non valide"
     esac 
 }
-confirm
 
+while getopts "fh" OPT
+do
+    case "${OPT}" in
+      f)
+          forcemode=1
+          ;;
+
+      h)
+	  usage
+	  exit 0
+          ;;
+    esac
+done
+shift $((OPTIND-1))
+
+filename="${1}"
+
+if [[ -z "${filename}" ]] ; then
+	usage
+fi
+
+if [[ ! -r "${filename}" ]] ; then
+	echo "erreur ouverture fichier"
+	exit 2
+fi
+
+if [[ "${forcemode}" == 1 ]]; then
+	restore
+	exit 0
+else
+	confirm
+	exit 0
+fi
 exit 0

script/restauration/rest45

@@ -1,26 +1,53 @@
 #!/bin/bash
 HOST=root@onfarbo45
-restore () {
+
-ssh "${HOST}" "mysql -u ap45 -pAzerty1+ bdarbre" < bdarbre45.sql
+usage() { 
+echo -e "Usage: $0 [-f] <compressed dumpfile>\n\t-f: force mode\n\t-h: this help\n" 1>&2; exit 1; }
+
+restore() {
+	zcat "${filename}" | ssh "${HOST}"  "mysql -u ap45 -pAzerty1+ bdarbre" 
 }
-while getopts "f" OPT
-do
-    case "${OPT}" in
-      f)
-          restore
-          exit 0;
-          ;;
-    esac
-done
 
 confirm() {
     read -r -n 1 -p "${1:-Confirmer?} [o/n]: " REPLY
-    case $REPLY in
+    case "${REPLY}" in
       [oO]) echo ; restore ;;
-      [nN]) echo ; exit 0 ;;
+      [nN]) echo ; exit 1 ;;
       *) printf " \033[31m %s \n\033[0m" "Entrée non valide"
     esac 
 }
-confirm
 
+while getopts "fh" OPT
+do
+    case "${OPT}" in
+      f)
+          forcemode=1
+          ;;
+
+      h)
+	  usage
+	  exit 0
+          ;;
+    esac
+done
+shift $((OPTIND-1))
+
+filename="${1}"
+
+if [[ -z "${filename}" ]] ; then
+	usage
+fi
+
+if [[ ! -r "${filename}" ]] ; then
+	echo "erreur ouverture fichier"
+	exit 2
+fi
+
+if [[ "${forcemode}" == 1 ]]; then
+	restore
+	exit 0
+else
+	confirm
+	exit 0
+fi
 exit 0

script/sauvegarde/php43/ONF/getLesInterventions.php

@@ -1,19 +0,0 @@
-<?php
-
-include_once 'include/chargementClasses.php';
-
-try{
-    
-    $laConnexion = new ConnexionBDD();
-    $sql = 'SELECT * FROM intervention INNER JOIN arbre ON arbre.id = intervention.idArbre;';
-    $reponse = $laConnexion->dbh()->query($sql);
-    
-    $output = array("lesInterventions"=>$reponse->fetchAll(PDO::FETCH_ASSOC));
-    
-}catch (Exception $e){
-    
-    die('Erreur : '.$e->getMessage());
-    
-}
-    
-echo(json_encode($output));    

script/sauvegarde/php43/ONF/include/ConnexionBDD.php

@@ -1,45 +0,0 @@
-<?php
-
-/* 
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-class ConnexionBDD {
-    
-    private $_dbh;   // Chaine de connexion
-    
-    /**
-     * Connexion persistante au serveur
-     * @return \PDO Connexion
-     */    
-    public function __construct(){
-        // Définition des variables de connexion
-        $user = "ap43";
-        $pass = "Azerty1+";
-        $dsn ='mysql:host=localhost;dbname=bdarbre'; //Data Source Name
-
-        // Connexion 
-        try {
-            $this->_dbh = new PDO($dsn, $user, $pass, array(PDO::ATTR_PERSISTENT=>true, 
-            PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'UTF8\''));  // Connexion persistante            
-        }
-        catch (PDOException $e) {
-            die("Erreur : " . $e->getMessage());
-        }        
-    }
-    /** afficherErreurSQL : 
-     *  Affichage de messages lors l'accès à la bdd avec une requete SQL
-     *  @param $message	: message a afficher
-    */		
-    function afficherErreurSQL($message, $sql="") {
-        echo $message . "<br />" . $sql . "<br />"; 
-        $info = $this->_dbh->errorInfo();
-        echo "Code erreur : " . $info[0] . ", Message : " . $info[2];      
-        die();
-    }
-    function dbh() {
-        return $this->_dbh;
-    }
-}

script/sauvegarde/php43/ONF/include/chargementClasses.php

@@ -1,7 +0,0 @@
-<?php
-spl_autoload_register('chargerClasse');
-function chargerClasse($classe){
-    
-    require "include/".$classe.".php";
-    
-}

script/sauvegarde/php43/ONF/index.php

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<!--
-To change this license header, choose License Headers in Project Properties.
-To change this template file, choose Tools | Templates
-and open the template in the editor.
--->
-<html>
-    <head>
-        <meta charset="UTF-8">
-        <title></title>
-    </head>
-    <body>
-        <?php
-        // put your code here
-        ?>
-    </body>
-</html>

script/sauvegarde/php43/ONF/nbproject/private/private.properties

@@ -1,6 +0,0 @@
-copy.src.files=false
-copy.src.on.open=false
-copy.src.target=/var/www/PhpProject1
-index.file=index.php
-run.as=LOCAL
-url=http://localhost/PHPProjects/ONF/

script/sauvegarde/php43/ONF/nbproject/project.properties

@@ -1,7 +0,0 @@
-include.path=${php.global.include.path}
-php.version=PHP_80
-source.encoding=UTF-8
-src.dir=.
-tags.asp=false
-tags.short=false
-web.root=.

script/sauvegarde/php43/ONF/nbproject/project.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.php.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>ONF</name>
-        </data>
-    </configuration>
-</project>

script/sauvegarde/sauvegarde43.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 HOST=root@onfarbo43
 DATEJ=$(date +%u)
-DATES=(date +%W)
+DATES=$(date +%W)
 semaineMod=$(("${DATES}" % 4))
 
 ssh "${HOST}" "mysqldump -u ap43 -pAzerty1+ bdarbre | gzip" > /root/sauv/jour/bdarbre43-"${DATEJ}".sql.gz
 
 ssh "${HOST}" "mysqldump -u ap43 -pAzerty1+ bdarbre | gzip" > /root/sauv/semaine/bdarbre43-"${semaineMod}".sql.gz
 
-scp -r "${HOST}":/var/www/html/PHPProjects/ONF /root/sauv/php43
+scp -r "${HOST}":/var/www/html/PHPProjectsAM/ /root/sauv/php43/AM
+scp -r "${HOST}":/var/www/html/PHPProjectsAS/ /root/sauv/php43/AS
 
 
 exit 0

script/sauvegarde/sauvegarde45.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 HOST=root@onfarbo45
 DATEJ=$(date +%u)
-DATES=(date +%W)
+DATES=$(date +%W)
 semaineMod=$(("${DATES}" % 4))
 
 ssh "${HOST}" "mysqldump -u ap45 -pAzerty1+ bdarbre | gzip" > /root/sauv/jour/bdarbre45-"${DATEJ}".sql.gz

wireguard/wg0.conf

@@ -0,0 +1,18 @@
+# local settings for Endpoint A
+[Interface]
+PrivateKey = kJfPU7pqldy6d7K+8Gbby7Hbw1zh7amdIIccmC9NY1s=
+Address = 10.0.0.1/32
+ListenPort = 51820
+ 
+# remote settings for Endpoint B
+[Peer]
+PublicKey = pMaLJGkdgcT3jwPC7F/EUlr9U8VbkZli9Ru65zkXH2U=
+#Endpoint = 192.168.1.82:51820
+AllowedIPs = 10.0.0.2/32
+ 
+# remote settings for Endpoint C
+[Peer]
+PublicKey = HuwPkFzi25gAovg+Ni7lpCK6TvcK1HBdbgg3lVRK+zY=
+#Endpoint = x.y.z.t:51820
+AllowedIPs = 10.0.0.3/32
+ 

wireguard/wgap4.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+set -u
+set -e
+ 
+AddressAwg=10.0.0.1/32  # Adresse VPN Wireguard extremite A
+EndpointA=10.121.38.70  # Adresse extremite A
+PortA=51820             # Port ecoute extremite A
+AddressBwg=10.0.0.2/32  # Adresse VPN Wireguard extremite B
+EndpointB=192.168.1.82  # Adresse extremite B
+PortB=51820             # Port ecoute extremite B
+AddressCwg=10.0.0.3/32
+EndpointC=x.y.z.t
+PortC=51820
+
+umask 077 ;  
+wg genkey > endpoint-a.key
+wg pubkey < endpoint-a.key > endpoint-a.pub
+ 
+wg genkey > endpoint-b.key
+wg pubkey < endpoint-b.key > endpoint-b.pub
+ 
+wg genkey > endpoint-c.key
+wg pubkey < endpoint-c.key > endpoint-c.pub
+PKA=$(cat endpoint-a.key)
+pKA=$(cat endpoint-a.pub)
+PKB=$(cat endpoint-b.key)
+pKB=$(cat endpoint-b.pub)
+PKC=$(cat endpoint-c.key)
+pKC=$(cat endpoint-c.pub)
+
+
+cat <<FINI > wg0-a.conf
+# local settings for Endpoint A
+[Interface]
+PrivateKey = $PKA
+Address = $AddressAwg
+ListenPort = $PortA
+ 
+# remote settings for Endpoint B
+[Peer]
+PublicKey = $pKB
+#Endpoint = ${EndpointB}:$PortB
+AllowedIPs = $AddressBwg
+ 
+# remote settings for Endpoint C
+[Peer]
+PublicKey = $pKC
+#Endpoint = ${EndpointC}:$PortC
+AllowedIPs = $AddressCwg
+ 
+FINI
+cat <<FINI > wg0-b.conf
+# local settings for Endpoint B
+[Interface]
+PrivateKey = $PKB
+Address = $AddressBwg
+ListenPort = $PortB
+ 
+# remote settings for Endpoint A
+[Peer]
+PublicKey = $pKA
+Endpoint = ${EndpointA}:$PortA
+AllowedIPs = $AddressAwg
+
+FINI
+cat <<FINI > wg0-c.conf
+# local settings for Endpoint C
+[Interface]
+PrivateKey = $PKC
+Address = $AddressCwg
+ListenPort = $PortC
+ 
+# remote settings for Endpoint A
+[Peer]
+PublicKey = $pKA
+Endpoint = ${EndpointA}:$PortA
+AllowedIPs = $AddressAwg
+
+FINI