efelon/shell_sequencer
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Enhanced output with new features of sequencer

Browse Source
This commit is contained in:
Martin Winkler
2022-02-15 14:01:52 +01:00
parent dcdb6b45a3
commit 653d233586
6 changed files with 69 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
seqs/matrix.sh
View File

@@ -182,7 +182,10 @@ step_12() {
exe service ${toolServiceName} restart exe service ${toolServiceName} restart
} }
step_14_info() { echo "Show $toolName version running at [IP]:8008"; } step_14_info() {
echoinfoArgs "[IP]:8008"
echo "Show $toolName version"
}
step_14_alias() { ALIAS="version"; } step_14_alias() { ALIAS="version"; }
step_14() { step_14() {
local synapseIP=localhost local synapseIP=localhost
@@ -196,8 +199,9 @@ step_14() {
exep "curl -sS \"$apiCall\" | python -m json.tool | grep _version" exep "curl -sS \"$apiCall\" | python -m json.tool | grep _version"
} }
step_16_info() { step_16_info() {
echo "List all registered users [OPTION] [IP]:8008" echoinfoArgs "[OPTION] [IP]:8008"
echo "List all registered users"
echoinfo "[OPTION]" echoinfo "[OPTION]"
echoinfo " -r : Raw json output" echoinfo " -r : Raw json output"
} }
@@ -238,12 +242,9 @@ step_18() {
step_20_info() { step_20_info() {
shift shift
echoinfoArgs "[USER NAME]"
echo -n "Reset user password" echo -n "Reset user password"
if [ -z $1 ]; then [ $CONTEXT_EXE -ne 0 ] && echoinfo " for $1" || echo
echo " [USER NAME]"
else
echo " for $1"
fi
} }
step_20_alias() { ALIAS="resetpw"; } step_20_alias() { ALIAS="resetpw"; }
step_20() { step_20() {
@@ -268,7 +269,8 @@ step_20() {
} }
step_22_info() { step_22_info() {
echo "List all rooms [OPTION] [IP]:8008" echoinfoArgs "[OPTION] [IP]:8008"
echo "List all rooms"
echoinfo "[OPTION]" echoinfo "[OPTION]"
echoinfo " -r : Raw json output" echoinfo " -r : Raw json output"
} }
@@ -303,7 +305,8 @@ step_22() {
} }
step_24_info() { step_24_info() {
echo "List all room members [OPTION] [ROOM ID] [IP]:8008" echoinfoArgs "[OPTION] [ROOM ID] [IP]:8008"
echo "List all room members"
echoinfo "[OPTION]" echoinfo "[OPTION]"
echoinfo " -r : Raw json output" echoinfo " -r : Raw json output"
} }
@@ -342,7 +345,11 @@ step_24() {
exep "curl -sS --header \"Authorization: Bearer $MATRIX_ACCESS\" \"$apiCall\" | python -m json.tool $grepOut" exep "curl -sS --header \"Authorization: Bearer $MATRIX_ACCESS\" \"$apiCall\" | python -m json.tool $grepOut"
} }
step_26_info() { echo "Delete rooms without local users [IP]:8008"; } step_26_info() {
echoinfoArgs "[IP]:8008"
echo "Delete rooms without local users"
echoinfo " [IP] : default is localhost"
}
step_26_alias() { ALIAS="purge"; } step_26_alias() { ALIAS="purge"; }
step_26() { step_26() {
adminTokenCheck adminTokenCheck
@@ -371,7 +378,8 @@ step_26() {
step_28_info() { step_28_info() {
echo "Delete room [OPTION] <ROOM ID> [IP]:8008" echoinfoArgs "<ROOM ID> [IP]:8008"
echo "Delete room"
} }
step_28_alias() { ALIAS="deleteroom"; } step_28_alias() { ALIAS="deleteroom"; }
step_28() { step_28() {
@@ -418,7 +426,7 @@ postDataDeleteRoom()
EOF EOF
} }
step_30_info() { echo "Debloat postgres [DATABASE]"; echo; } step_30_info() { echoinfoArgs "[DATABASE]"; echo "Debloat postgres"; echo; }
step_30_alias() { ALIAS="debloat"; } step_30_alias() { ALIAS="debloat"; }
step_30() { step_30() {
shift shift

3
seqs/mayan-edms.sh
View File

@@ -120,7 +120,8 @@ save \"\"
databases 2" databases 2"
step_10_info() { step_10_info() {
echo "Upgrade $toolName to $toolVersion [OPTIONS]" echoinfoArgs "[OPTIONS]"
echo "Upgrade $toolName to $toolVersion"
echoinfo " [OPTIONS]" echoinfo " [OPTIONS]"
echoinfo " super : update also supervisor configuration" echoinfo " super : update also supervisor configuration"
echoinfo " (manual redis password update may be needed)" echoinfo " (manual redis password update may be needed)"

52
seqs/nextcloud.sh
View File

@@ -4,6 +4,7 @@
# - mysql.sh (soft; Missing informational output) # - mysql.sh (soft; Missing informational output)
toolName="nextcloud" toolName="nextcloud"
localOcc=("echo" "occ not found!")
# Get script working directory # Get script working directory
# (when called from a different directory) # (when called from a different directory)
@@ -18,6 +19,7 @@ step_config() {
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
CONFIG=1 CONFIG=1
fi fi
localOcc=( sudo -u www-data php "$(escpath "$NC_INSTALL_DIR/occ")" )
} }
step_20_info() { echo "Upgrade $toolName on command line to latest version of selected release channel"; } step_20_info() { echo "Upgrade $toolName on command line to latest version of selected release channel"; }
@@ -32,10 +34,21 @@ step_20() {
} }
ncInstaller="updater/updater.phar" ncInstaller="updater/updater.phar"
step_100_info() { echoinfoArgs "<NC DATABASE> <IPV4 ADDRESS>"; echo "Delete IP from bruteforce table"; } step_100_info() {
step_100_alias() { ALIAS="bruteforceRemoveIP"; } echoinfoArgs "[OCC ARGS]"
echo "Execute occ command"
}
step_100_alias() { ALIAS="occ"; }
step_100() { step_100() {
shift shift
exe "${localOcc[@]}" "$@"
}
step_102_info() { echoinfoArgs "<NC DATABASE> <IPV4 ADDRESS>"; echo "Delete IP from bruteforce table"; }
step_102_alias() { ALIAS="bruteforceRemoveIP"; }
step_102() {
shift
local ncdb= local ncdb=
local ip= local ip=
local ipregex='^[0-2]*[0-9]{1,2}\.[0-2]*[0-9]{1,2}\.[0-2]*[0-9]{1,2}\.[0-2]*[0-9]{1,2}$' local ipregex='^[0-2]*[0-9]{1,2}\.[0-2]*[0-9]{1,2}\.[0-2]*[0-9]{1,2}\.[0-2]*[0-9]{1,2}$'
@@ -62,33 +75,44 @@ step_100() {
endReturn -o $? "Error deleting ip $ip" endReturn -o $? "Error deleting ip $ip"
} }
step_102_info() { echoinfoArgs "<USER>"; echo "Reset and rescan the music library in the background for one user"; } step_104_info() { echoinfoArgs "<USER>"; echo "Reset and rescan the music library in the background for one user"; }
step_102_alias() { ALIAS="audioreset"; } step_104_alias() { ALIAS="audioreset"; }
step_102() { step_104() {
shift shift
local ncUser=$1 local ncUser=$1
local lOcc="sudo -u www-data php $NC_INSTALL_DIR/occ"
if [ -z "$ncUser" ] ; then if [ -z "$ncUser" ] ; then
echoerr " [E] Reset only for single user" echoerr " [E] Reset only for single user"
return 1 return 1
fi fi
exep "sudo -u www-data php \"$NC_INSTALL_DIR/occ\" audioplayer:reset $ncUser > /var/log/ncAudioRescan.log" exep "${localOcc[@]} audioplayer:reset $ncUser > /var/log/ncAudioRescan.log"
echoseq " [I] Rescan audioplayer database for user $ncUser" echoseq " [I] Rescan audioplayer database for user $ncUser"
exep "sudo -u www-data php \"$NC_INSTALL_DIR/occ\" audioplayer:scan -vvvv $ncUser >> /var/log/ncAudioRescan.log &" exep "${localOcc[@]} audioplayer:scan -vvvv $ncUser >> /var/log/ncAudioRescan.log &"
} }
step_104_info() { echo "Reset picture preview folder"; } step_106_info() { echoinfoArgs "<USER>"; echo "Scan the music library"; }
step_104_alias() { ALIAS="resetpreview"; } step_106_alias() { ALIAS="audioscan"; }
step_104() { step_106() {
local lOcc="sudo -u www-data php \"$NC_INSTALL_DIR/occ\"" shift
local ncUser=$1
if [ -z "$ncUser" ] ; then
echoerr " [E] Reset only for single user"
return 1
fi
exe "${localOcc[@]}" audioplayer:scan -vvvv $ncUser
}
step_110_info() { echo "Reset picture preview folder"; }
step_110_alias() { ALIAS="resetpreview"; }
step_110() {
if [ -e "${NC_DATA_DIR}" ]; then if [ -e "${NC_DATA_DIR}" ]; then
exe rm -rf "${NC_DATA_DIR}/appdata_"*"/preview/"* exe rm -rf "${NC_DATA_DIR}/appdata_"*"/preview/"*
echoseq " [I] Rescan app data folder" echoseq " [I] Rescan app data folder"
exep "$lOcc files:scan-app-data &" exep "${localOcc[@]} files:scan-app-data &"
else else
echoerr " [E] Nextcloud data direcotry $NC_DATA_DIR not found" echoerr " [E] Nextcloud data direcotry $NC_DATA_DIR not found"
return 1 return 1
@@ -113,5 +137,5 @@ occ config:app:set preview jpeg_quality --value="60"
NOTES_END NOTES_END
} }
VERSION_SEQREV=14 VERSION_SEQREV=15
. /usr/local/bin/sequencer.sh . /usr/local/bin/sequencer.sh

4
seqs/onlyoffice.sh
View File

@@ -95,9 +95,9 @@ step_4() {
} }
step_5_info() { step_5_info() {
echoinfoArgs "<SECRET>" echoinfoArgs "[SECRET]"
echo "Install/start onlyoffice docker container" echo "Install/start onlyoffice docker container"
echoinfo "If <SECRET> is empty, user input will be available if not run --quiet." echoinfo "If [SECRET] is empty, user input will be available if not run --quiet."
echoinfo "$toolName will be run unsecured if no secret was provied." echoinfo "$toolName will be run unsecured if no secret was provied."
} }
step_5_alias() { ALIAS="startoo"; } step_5_alias() { ALIAS="startoo"; }

2
seqs/openvpn.sh
View File

@@ -30,7 +30,7 @@ step_config() {
# # End if no configuration file exists # # End if no configuration file exists
# [ $DRY -eq 0 ] && return -1 # [ $DRY -eq 0 ] && return -1
#fi #fi
#[ $QUIET -ne 0 ] && APTOPT="-y" [ $QUIET -ne 0 ] && APTOPT="-y"
return 0 return 0
} }

7
seqs/piwigo.sh
View File

@@ -30,7 +30,10 @@ step_30() {
exep "cd \"${PIWI_DIR}\"/.. && tar czf \"${PIWI_BU_DIR}/\`date +%Y%m%d\`_${toolName}_web.tar.gz\" --exclude=\"${toolName}/network/*\" --exclude=\"${toolName}/_data/i/*\" \"$(basename "$PIWI_DIR")\"" exep "cd \"${PIWI_DIR}\"/.. && tar czf \"${PIWI_BU_DIR}/\`date +%Y%m%d\`_${toolName}_web.tar.gz\" --exclude=\"${toolName}/network/*\" --exclude=\"${toolName}/_data/i/*\" \"$(basename "$PIWI_DIR")\""
} }
step_31_info() { echo "Backup ${toolName} database [daily|monthly(default)]"; } step_31_info() {
echoinfoArgs "[daily|monthly(default]"
echo "Backup ${toolName} database"
}
step_31_alias() { ALIAS="backupdb"; } step_31_alias() { ALIAS="backupdb"; }
step_31() { step_31() {
case "$2" in case "$2" in
@@ -45,5 +48,5 @@ step_31() {
esac esac
} }
VERSION_SEQREV=12 VERSION_SEQREV=14
. /usr/local/bin/sequencer.sh . /usr/local/bin/sequencer.sh