apache_tools.sh

-remplacement de sphp par Brew PHP switcher

apache_tools.sh

@@ -41,6 +41,7 @@ echo ""
 
 # MySQL
 v_mysql=$(mysql --help | grep -A1 'Default options')
+v_php_apache=$(php --info | grep 'PHP Version' | sed -n '1p')
 
 options=(
     "Apache (r)estart"
@@ -53,12 +54,16 @@ options=(
     "(O)pen PHP info page in browser"
     "Apache/PHP/MySQL (V)ersion"
     "Apache/PHP/MySQL (C)onfiguration files"
-    "S(w)itch to PHP version (sphp)"
-    "(U)pdate sphp"
+    "S(w)itch to PHP version (Brew PHP switcher)"
+    #"(U)pdate sphp"
     "Edit additio(n)nals *.ini files"
     "(Q)uit"
 )
 
+# sphp:
+# https://gist.github.com/rhukster/f4c04f1bf59e0b74e335ee5d186a98e2/
+# remplacé par Brew PHP switcher
+# https://github.com/philcook/brew-php-switcher#readme
 
 select option in "${options[@]}"; do
     case "$REPLY" in 
@@ -70,13 +75,13 @@ select option in "${options[@]}"; do
         6|a|A) tail -f "$access_apa" ;;
         7|p|P) "$editeur" "$conf_php" ;;					# php.ini
         8|o|O) echo '<?php echo phpinfo(); ?>' > $document_root/php-info.php && open 'http://localhost/php-info.php' ;;
-        9|v|V) apachectl -v && echo ' ' && php -v && echo ' ' && mysql --version ;;
+        9|v|V) apachectl -v && echo ' ' && php -v && echo ' ' && echo "$v_php_apache (Apache)" && echo ' ' && mysql --version ;;
         10|c|C) echo -e "\033[4mApache:\033[0m " && echo $v_apa && echo ' ' && echo -e "\033[4mPHP:\033[0m " && echo $v_php  && echo ' ' && echo -e "\033[4mMySQL:\033[0m " && echo $v_mysql ;;
         11|w|W) read -e -n 3 -p "Which PHP version? (7.2/7.3/7.4): " choice
 #        	if [ "$choice" == "7.2" ] || [ "$choice" == "7.3" ] || [ "$choice" == "7.4" ]; then sphp "$choice" ; fi ;;
 #         	if [ "$choice" == "7.2" ] || [ "$choice" == "7.3" ] || [ "$choice" == "7.4" ]; then echo "$choice" | xargs -p -n 1 sphp ; fi ;;
-        	if [[ "$choice" == "7.2" ]] || [[ "$choice" == "7.3" ]] || [[ "$choice" == "7.4" ]]; then echo "$choice" | xargs -p -n 1 sphp ; fi ;;
-        12|u|U) curl -L 'https://gist.githubusercontent.com/rhukster/f4c04f1bf59e0b74e335ee5d186a98e2/raw' > /usr/local/bin/sphp && chmod +x /usr/local/bin/sphp ;;
+        	if [[ "$choice" == "7.2" ]] || [[ "$choice" == "7.3" ]] || [[ "$choice" == "7.4" ]]; then echo "$choice" | xargs -p -n 1 brew-php-switcher ; fi ;;
+        #12|u|U) curl -L 'https://gist.githubusercontent.com/rhukster/f4c04f1bf59e0b74e335ee5d186a98e2/raw' > /usr/local/bin/sphp && chmod +x /usr/local/bin/sphp ;;
         13|n|N) add_ini 
         		read -e -n 1 -p "Edit which file ?: " choice
         		#if [[ "$choice" == 1 ]] || [[ "$choice" == 4 ]]; then "$editeur" ${additionnal[$choice]}; fi ;;

backup-conf.sh

@@ -53,16 +53,19 @@ copy() {
 	if [[ -f $1 ]]; then cp $1 $2; fi
 }
 
+# Backup folder
+
+dest=$HOME/Documents/Configurations/SilverBook
+
 # Web: PHP / Apache / MySQL
 
+dest_mamp=$dest/config\ web\ \(homebrew\)/
+cd "$dest_mamp"
+
 CURRENT_APACHE=$(httpd -v | grep "version" | awk '{print $3}' | awk -F/ '{print $2}')
 CURRENT_PHP=$(php -v | grep "cli" | awk '{print $2}')
 CURRENT_MYSQL=$(mysql -V | awk '{print $5}' | sed 's/.$//')
 
-dest=$HOME/Documents/Configurations/SilverBook
-dest_mamp=$dest/config\ web\ \(homebrew\)/
-cd "$dest_mamp"
-
 if [ ! -d "apache $CURRENT_APACHE" ]; then mkdir "apache $CURRENT_APACHE"; fi
 cp /usr/local/etc/httpd/httpd.conf "$dest_mamp/apache $CURRENT_APACHE/"
 cp /usr/local/etc/httpd/server.crt "$dest_mamp/apache $CURRENT_APACHE/"

mbv-gitea-upd.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+echo "****************"
+echo "* Update gitea *"
+echo "****************"
+
+GITEA_BIN=`which gitea`
+if [ "$GITEA_BIN" ==  "*gitea*" ]; then
+    echo "Gitea is not installed..."
+    exit 0
+fi
+#GITEA_INSTALLED=`/usr/local/bin/gitea --version | cut -d \  -f 3`
+GITEA_INSTALLED=`$GITEA_BIN --version | cut -d \  -f 3`
+
+LATEST_URL=`curl -Ls -o /dev/null -w %{url_effective} https://github.com/go-gitea/gitea/releases/latest`
+#https://github.com/go-gitea/gitea/releases/tag/v1.11.3
+
+#echo LATEST_URL = ${LATEST_URL}
+GITEA_VERSION=${LATEST_URL##*/v}
+
+echo "Installed: "${GITEA_INSTALLED}
+echo "Latest: "${GITEA_VERSION}
+
+
+now=$(date +"%d-%m-%Y_%T")
+server=$(hostname -s)
+file=$server"@"$now
+filename="Gitea_$file.sql"
+#echo $filename
+
+if [ "${GITEA_INSTALLED}" == "${GITEA_VERSION}" ]; then
+    echo "No update available..."
+    exit 0
+
+else
+
+	a=$(echo -e "Do you wanna update gitea ? (y/n)")
+	read -p "$a" choice
+	
+	if [ "$choice" == "y" ] || [ "$choice" == "Y" ]; then
+
+		echo "Download latest gitea..."
+		DOWNLOAD_URL=https://github.com/go-gitea/gitea/releases/download/v${GITEA_VERSION}/gitea-${GITEA_VERSION}-linux-amd64
+		echo ${DOWNLOAD_URL}
+		wget -O /tmp/gitea ${DOWNLOAD_URL}
+		#xz --decompress gitea-*.xz
+
+		echo "Stop gitea service..."
+		sudo systemctl stop gitea
+
+		echo "Backup gitea mysql database..."
+		sudo mysqldump -u root admin_gitea > /tmp/$filename
+
+		echo "Installing gitea..."
+		# -rwxr-xr-x  1 bruno psacln 83144088 Apr  1 19:28 gitea
+		#sudo mv /tmp/gitea /usr/local/bin
+		#sudo chmod +x /usr/local/bin/gitea
+		sudo mv /tmp/gitea `dirname "$GITEA_BIN"`
+		sudo chmod +x ${GITEA_BIN}
+
+		echo "Restart gitea service..."
+		sudo systemctl restart gitea
+	
+	fi
+
+fi

mkbuild.sh

@@ -13,20 +13,25 @@ fi
 
 project_dir=/Users/bruno/project
 #exe=/usr/local/bin/
+folder="central_docs"
 
 # server1: clicclac.synology.me
 declare -A server1
 server1[user]="bruno"
 server1[server]="clicclac.synology.me"
-server1[destination]="/volume1/web"
-server1[local_folder]="central_docs"
+server1[dest]="/volume1/web/$folder/"
 
 # server2: ovh.net
 declare -A server2
 server2[user]="funnymac"
 server2[server]="ftp.cluster011.ovh.net"
-server2[destination]="/homez.528/funnymac/www"
-server2[local_folder]="central_docs"
+server2[dest]="www/$folder/"
+
+# server3: maboiteverte.fr
+declare -A server3
+server3[user]="bruno"
+server3[server]="ftp.maboiteverte.fr"
+server3[dest]="httpdocs/$folder/"
 
 notification() {
 	path_img=`dirname "$0"`
@@ -52,15 +57,36 @@ notification() {
 
 cd $project_dir || exit
 mkdocs build --clean
-#rsync -avz --stats --progress /Users/bruno/project/central_docs/ $user@$server::$dest 
 
-scp -P42666 -pr ./${server1[local_folder]} ${server1[user]}@${server1[server]}:${server1[destination]}
+echo ""
+echo "*********************************************"
+echo "*  sending Docs to ${server1[server]}...  *"
+echo "*********************************************"
+echo ""
 
+rsync -e '/usr/bin/ssh -p 42666' --exclude-from="$HOME/.exclude-rsync.txt" --rsync-path=/bin/rsync -zarvh --stats --progress "$folder/" ${server1[user]}@${server1[server]}:${server1[dest]}
 result=$?
+
 notification "MkDocs: sending Docs to ${server1[server]}..." "${server1[server]}" $result
 
+echo ""
+echo "***********************************************"
+echo "*  sending Docs to ${server2[server]}...  *"
+echo "***********************************************"
+echo ""
 
-scp -pr ./${server2[local_folder]} ${server2[user]}@${server2[server]}:${server2[destination]}
-
+rsync --exclude-from="$HOME/.exclude-rsync.txt" -zarvh --stats --progress "$folder/" ${server2[user]}@${server2[server]}:${server2[dest]}
 result=$?
+        
 notification "MkDocs: sending Docs to ${server2[server]}..." "${server2[server]}" $result
+
+echo ""
+echo "********************************************"
+echo "*  sending Docs to ${server3[server]}...  *"
+echo "********************************************"
+echo ""
+
+rsync --exclude-from="$HOME/.exclude-rsync.txt" -zarvh --stats --progress "$folder/" ${server3[user]}@${server3[server]}:${server3[dest]}
+result=$?
+        
+notification "MkDocs: sending Docs to ${server3[server]}..." "${server3[server]}" $result

syno-cron-gitea-update.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+GITEA_INSTALLED=`/volume1/@appstore/Gitea/gitea/gitea --version | cut -d \  -f 3`
+
+LATEST_URL=`curl -Ls -o /dev/null -w %{url_effective} https://github.com/go-gitea/gitea/releases/latest`
+#https://github.com/go-gitea/gitea/releases/tag/v1.11.3
+
+echo LATEST_URL = ${LATEST_URL}
+GITEA_VERSION=${LATEST_URL##*/v}
+
+if [ "${GITEA_INSTALLED}" == "${GITEA_VERSION}" ]; then
+    echo "No update available..."
+    exit 0
+fi
+
+#Install
+echo "Installed: "${GITEA_INSTALLED}
+echo "Latest: "${GITEA_VERSION}
+rm -rf /tmp/gitea
+mkdir /tmp/gitea
+cd /tmp/gitea
+echo "Clone gitea-spk..."
+git clone https://github.com/flipswitchingmonkey/gitea-spk.git
+cd gitea-spk
+
+echo "Download latest gitea..."
+DOWNLOAD_URL=https://github.com/go-gitea/gitea/releases/download/v${GITEA_VERSION}/gitea-${GITEA_VERSION}-linux-amd64.xz
+#echo ${DOWNLOAD_URL}
+
+# sudo opkg install wget (sinon pas de https)
+wget ${DOWNLOAD_URL}
+# sudo opkg install xz
+xz --decompress gitea-*.xz
+# sudo opkg install tar (sinon tar: unrecognized option '--exclude=INFO.in')
+echo "Create spk package..."
+./create_spk.sh
+
+echo "Install spk package..."
+sudo synoservice --stop  pkgctl-Gitea
+
+#echo "Backup gitea mysql database..."
+#sudo mysqldump -u root admin_gitea > /tmp/$filename
+
+sudo synoservice --status  pkgctl-Gitea
+sudo synopkg install /tmp/gitea/gitea-spk/gitea-${GITEA_VERSION}-linux-amd64.spk
+sudo synoservice --start  pkgctl-Gitea
+
+exit 1