SetAllPass a disparu ! Reste le secretgen à refaire + revoir les valeurs "liées" par setallpass. Rien n'est testé pour le moment.
This commit is contained in:
		@@ -61,20 +61,6 @@ doCompose () {
 | 
			
		||||
	${SIMU} ln -fs ../../config/dockers.env .env
 | 
			
		||||
    fi
 | 
			
		||||
    ${SIMU} docker-compose $1
 | 
			
		||||
 | 
			
		||||
    if [ "$2" = "cachet" ] && [ "$1" != "down" ]; then
 | 
			
		||||
	NEW_KEY=$(cd "${KAZ_COMP_DIR}/$2" ; docker-compose logs | grep APP_KEY=base64: | sed "s/^.*'APP_KEY=\(base64:[^']*\)'.*$/\1/" | tail -1)
 | 
			
		||||
	if [ -n "${NEW_KEY}" ]; then
 | 
			
		||||
	    printKazMsg "cachet key change"
 | 
			
		||||
	    # change key
 | 
			
		||||
	    ${SIMU} sed -i \
 | 
			
		||||
		    -e 's%^\(\s*cachet_APP_KEY=\).*$%\1"'"${NEW_KEY}"'"%' \
 | 
			
		||||
		    "${KAZ_KEY_DIR}/SetAllPass.sh"
 | 
			
		||||
	    ${SIMU} "${KAZ_BIN_DIR}/secretGen.sh"
 | 
			
		||||
	    # restart
 | 
			
		||||
	    ${SIMU} docker-compose $1
 | 
			
		||||
	fi
 | 
			
		||||
    fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
doComposes () {
 | 
			
		||||
@@ -177,7 +163,6 @@ statusComposes () {
 | 
			
		||||
 | 
			
		||||
saveComposes () {
 | 
			
		||||
    . "${DOCKERS_ENV}"
 | 
			
		||||
    . "${KAZ_ROOT}/secret/SetAllPass.sh"
 | 
			
		||||
 | 
			
		||||
    savedComposes+=( ${enableMailComposes[@]} )
 | 
			
		||||
    savedComposes+=( ${enableProxyComposes[@]} )
 | 
			
		||||
@@ -195,67 +180,80 @@ saveComposes () {
 | 
			
		||||
	    ;;
 | 
			
		||||
	    sympa)
 | 
			
		||||
       		echo "save sympa"
 | 
			
		||||
		saveDB ${sympaDBName} "${sympa_MYSQL_USER}" "${sympa_MYSQL_PASSWORD}" "${sympa_MYSQL_DATABASE}" sympa mysql
 | 
			
		||||
		. $KAZ_BIN_DIR/getPasswords.sh sympaDB
 | 
			
		||||
		saveDB ${sympaDBName} "${sympaDB_MYSQL_USER}" "${sympaDB_MYSQL_PASSWORD}" "${sympaDB_MYSQL_DATABASE}" sympa mysql
 | 
			
		||||
		;;
 | 
			
		||||
	    web)
 | 
			
		||||
		# rien à faire (fichiers)
 | 
			
		||||
		;;
 | 
			
		||||
	    etherpad)
 | 
			
		||||
		echo "save pad"
 | 
			
		||||
		saveDB ${etherpadDBName} "${etherpad_MYSQL_USER}" "${etherpad_MYSQL_PASSWORD}" "${etherpad_MYSQL_DATABASE}" etherpad mysql
 | 
			
		||||
		. $KAZ_BIN_DIR/getPasswords.sh etherpadDB
 | 
			
		||||
		saveDB ${etherpadDBName} "${etherpadDB_MYSQL_USER}" "${etherpadDB_MYSQL_PASSWORD}" "${etherpadDB_MYSQL_DATABASE}" etherpad mysql
 | 
			
		||||
		;;
 | 
			
		||||
	    framadate)
 | 
			
		||||
		echo "save date"
 | 
			
		||||
		saveDB ${framadateDBName} "${framadate_MYSQL_USER}" "${framadate_MYSQL_PASSWORD}" "${framadate_MYSQL_DATABASE}" framadate mysql
 | 
			
		||||
		echo "save date"		
 | 
			
		||||
		. $KAZ_BIN_DIR/getPasswords.sh framadateDB
 | 
			
		||||
		saveDB ${framadateDBName} "${framadateDB_MYSQL_USER}" "${framadateDB_MYSQL_PASSWORD}" "${framadateDB_MYSQL_DATABASE}" framadate mysql
 | 
			
		||||
		;;
 | 
			
		||||
	    cloud)
 | 
			
		||||
		echo "save cloud"
 | 
			
		||||
		saveDB ${nextcloudDBName} "${nextcloud_MYSQL_USER}" "${nextcloud_MYSQL_PASSWORD}" "${nextcloud_MYSQL_DATABASE}" nextcloud mysql
 | 
			
		||||
		. $KAZ_BIN_DIR/getPasswords.sh nextcloudDB
 | 
			
		||||
		saveDB ${nextcloudDBName} "${nextcloudDB_MYSQL_USER}" "${nextcloudDB_MYSQL_PASSWORD}" "${nextcloudDB_MYSQL_DATABASE}" nextcloud mysql
 | 
			
		||||
		;;
 | 
			
		||||
	    paheko)
 | 
			
		||||
		# rien à faire (fichiers)
 | 
			
		||||
		;;		
 | 
			
		||||
	    mattermost)
 | 
			
		||||
		echo "save mattermost"
 | 
			
		||||
		saveDB matterPG "${mattermost_POSTGRES_USER}" "${mattermost_POSTGRES_PASSWORD}" "${mattermost_POSTGRES_DB}" mattermost postgres
 | 
			
		||||
		. $KAZ_BIN_DIR/getPasswords.sh mattermostDB
 | 
			
		||||
		saveDB matterPG "${mattermostDB_POSTGRES_USER}" "${mattermostDB_POSTGRES_PASSWORD}" "${mattermostDB_POSTGRES_DB}" mattermost postgres
 | 
			
		||||
		;;
 | 
			
		||||
	    mobilizon)
 | 
			
		||||
		echo "save mobilizon"
 | 
			
		||||
		saveDB ${mobilizonDBName} "${mobilizon_POSTGRES_USER}" "${mobilizon_POSTGRES_PASSWORD}" "${mobilizon_POSTGRES_DB}" mobilizon postgres
 | 
			
		||||
		. $KAZ_BIN_DIR/getPasswords.sh mobilizonDB
 | 
			
		||||
		saveDB ${mobilizonDBName} "${mobilizonDB_POSTGRES_USER}" "${mobilizonDB_POSTGRES_PASSWORD}" "${mobilizonDB_POSTGRES_DB}" mobilizon postgres
 | 
			
		||||
		;;
 | 
			
		||||
	    peertube)
 | 
			
		||||
		echo "save peertube"
 | 
			
		||||
		saveDB ${peertubeDBName} "${peertube_POSTGRES_USER}" "${peertube_POSTGRES_PASSWORD}" "${PEERTUBE_DB_HOSTNAME}" peertube postgres
 | 
			
		||||
		. $KAZ_BIN_DIR/getPasswords.sh peertubeDB
 | 
			
		||||
		saveDB ${peertubeDBName} "${peertubeDB_POSTGRES_USER}" "${peertubeDB_POSTGRES_PASSWORD}" "${peertubeDB_PEERTUBE_DB_HOSTNAME}" peertube postgres
 | 
			
		||||
		;;
 | 
			
		||||
	    mastodon)
 | 
			
		||||
		echo "save mastodon"
 | 
			
		||||
		saveDB ${mastodonDBName} "${mastodon_POSTGRES_USER}" "${mastodon_POSTGRES_PASSWORD}" "${mastodon_POSTGRES_DB}" mastodon postgres
 | 
			
		||||
		. $KAZ_BIN_DIR/getPasswords.sh mastodonDB
 | 
			
		||||
		saveDB ${mastodonDBName} "${mastodonDB_POSTGRES_USER}" "${mastodonDB_POSTGRES_PASSWORD}" "${mastodonDB_POSTGRES_DB}" mastodon postgres
 | 
			
		||||
		;;
 | 
			
		||||
	    roundcube)
 | 
			
		||||
		echo "save roundcube"
 | 
			
		||||
		saveDB ${roundcubeDBName} "${roundcube_MYSQL_USER}" "${roundcube_MYSQL_PASSWORD}" "${roundcube_MYSQL_DATABASE}" roundcube mysql
 | 
			
		||||
		. $KAZ_BIN_DIR/getPasswords.sh roundcubeDB
 | 
			
		||||
		saveDB ${roundcubeDBName} "${roundcubeDB_MYSQL_USER}" "${roundcubeDB_MYSQL_PASSWORD}" "${roundcubeDB_MYSQL_DATABASE}" roundcube mysql
 | 
			
		||||
		;;	
 | 
			
		||||
	    vaultwarden)
 | 
			
		||||
		echo "save vaultwarden"
 | 
			
		||||
		saveDB ${vaultwardenDBName} "${vaultwarden_MYSQL_USER}" "${vaultwarden_MYSQL_PASSWORD}" "${vaultwarden_MYSQL_DATABASE}" vaultwarden mysql
 | 
			
		||||
		. $KAZ_BIN_DIR/getPasswords.sh vaultwardenDB
 | 
			
		||||
		saveDB ${vaultwardenDBName} "${vaultwardenDB_MYSQL_USER}" "${vaultwardenDB_MYSQL_PASSWORD}" "${vaultwardenDB_MYSQL_DATABASE}" vaultwarden mysql
 | 
			
		||||
		;;
 | 
			
		||||
	    dokuwiki)
 | 
			
		||||
		# rien à faire (fichiers)
 | 
			
		||||
		;;
 | 
			
		||||
	    *-orga)
 | 
			
		||||
		ORGA=${compose%-orga}
 | 
			
		||||
		echo "save ${ORGA}"
 | 
			
		||||
		echo "save ${ORGA}"		
 | 
			
		||||
		if grep -q "cloud:" "${KAZ_COMP_DIR}/${compose}/docker-compose.yml" 2> /dev/null ; then
 | 
			
		||||
		    echo "    => cloud"
 | 
			
		||||
		    saveDB "${ORGA}-DB" "${nextcloud_MYSQL_USER}" "${nextcloud_MYSQL_PASSWORD}" "${nextcloud_MYSQL_DATABASE}" "${ORGA}-cloud" mysql
 | 
			
		||||
			. $KAZ_KEY_DIR/orgas/$ORGA/env-nextcloudDB
 | 
			
		||||
		    saveDB "${ORGA}-DB" "${MYSQL_USER}" "${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" "${ORGA}-cloud" mysql
 | 
			
		||||
		fi
 | 
			
		||||
		if grep -q "agora:" "${KAZ_COMP_DIR}/${compose}/docker-compose.yml" 2> /dev/null ; then
 | 
			
		||||
		    echo "    => mattermost"
 | 
			
		||||
		    saveDB "${ORGA}-DB" "${mattermost_MYSQL_USER}" "${mattermost_MYSQL_PASSWORD}" "${mattermost_MYSQL_DATABASE}" "${ORGA}-mattermost" mysql
 | 
			
		||||
			. $KAZ_KEY_DIR/orgas/$ORGA/env-mattermostDB
 | 
			
		||||
			saveDB "${ORGA}-DB" "${MYSQL_USER}" "${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" "${ORGA}-mattermost" mysql
 | 
			
		||||
		fi
 | 
			
		||||
		if grep -q "wordpress:" "${KAZ_COMP_DIR}/${compose}/docker-compose.yml" 2> /dev/null ; then
 | 
			
		||||
		    echo "    => wordpress"
 | 
			
		||||
		    saveDB "${ORGA}-DB" "${wp_MYSQL_USER}" "${wp_MYSQL_PASSWORD}" "${wp_MYSQL_DATABASE}" "${ORGA}-wordpress" mysql
 | 
			
		||||
			. $KAZ_KEY_DIR/orgas/$ORGA/env-wpDB
 | 
			
		||||
		    saveDB "${ORGA}-DB" "${MYSQL_USER}" "${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" "${ORGA}-wordpress" mysql
 | 
			
		||||
		fi
 | 
			
		||||
		;;
 | 
			
		||||
	esac
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user