diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2019-07-25 16:51:36 +0200 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2019-07-25 16:51:36 +0200 |
| commit | f69053c59a92274a7f42ae6d9dc53693be2e6055 (patch) | |
| tree | c483d6604fccd6a620bdfc315702de362460138f | |
| parent | df67896f6a84184ab3b736b02c7e7562aeada1e6 (diff) | |
| download | playbooks-ansible-f69053c59a92274a7f42ae6d9dc53693be2e6055.tar.gz playbooks-ansible-f69053c59a92274a7f42ae6d9dc53693be2e6055.tar.xz playbooks-ansible-f69053c59a92274a7f42ae6d9dc53693be2e6055.zip | |
Update php-fpm version for cirrus cloud and setfunctions script
| -rw-r--r-- | roles/clients/files/php-fpm-cirrus.service | 3 | ||||
| -rwxr-xr-x | roles/common/files/setfunctions.sh | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/roles/clients/files/php-fpm-cirrus.service b/roles/clients/files/php-fpm-cirrus.service index 56989e1..7fbbc06 100644 --- a/roles/clients/files/php-fpm-cirrus.service +++ b/roles/clients/files/php-fpm-cirrus.service @@ -9,8 +9,9 @@ ExecStart=/usr/bin/docker run -i --dns 163.172.211.128 \ -v /contener/%p/run/php-fpm:/run/php-fpm:z \ -v /contener/%p/var/log/php-fpm:/var/log/php-fpm:Z \ -v /contener/apache-cirrus/var/www/html:/var/www/html:z \ + -v /contener/memcached-cirrus/var/run/memcached:/var/run/memcached:z \ -v /contener/mariadb-cirrus/run/mariadb:/run/mariadb:z \ - php-fpm:7.2.12-1 + php-fpm:7.2.17-2 ExecReload=/usr/bin/kill -USR2 $MAINPID KillSignal=SIGINT diff --git a/roles/common/files/setfunctions.sh b/roles/common/files/setfunctions.sh index f60bbe8..a0f29b0 100755 --- a/roles/common/files/setfunctions.sh +++ b/roles/common/files/setfunctions.sh @@ -18,6 +18,37 @@ function xtail { fi } +# anthologie +function tarls { + # Détection du type de fichier d'archive + + local filetype # Sortie de la commande file + local compresstype # Premier mot de $tartype + local tarflags # Drapeaux d'option pour tar + local defaultflags # Drapeaux par défaut + + # on détermine le type de fichier + filetype=$(file "$1") + + # Récupération par cut du seul premier mot, par exemple "gzip" + compresstype=$(echo $filetype |cut -d ' ' -f 2) + + case $compresstype in + gzip) tarflags=-zvtf;; + bzip2) tarflags=-jvtf;; + XZ) tarflags=-Jvtf;; + POSIX) tarflags=-vtf;; + lzip) tarflags=--lzip + defaultflags=-vtf;; + LZMA) tarflags=--lzma + defaultflags=-vtf;; + "compress'd") tarflags=-Zvtf;; + *) echo "Type d'archive inconnu"; return 1;; + esac; + + tar $tarflags $defaultflags $1 +} + function xless { if [ "$#" -gt 0 ] then |