envs
/
ops
mirror of https://git.envs.net/envs/ops.git
1
0
Fork 0
Code Releases Activity

some small changes

This commit is contained in:
creme 2019-12-18 21:57:52 +01:00
parent 6bf608f178
commit 10866c63b1
Signed by: creme
GPG Key ID: C147C3B7FBDF08D0
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/conntrack.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
[[ "$EUID" -ne 0 ]] && printf 'Please run as root!\n' && exit 1 [ "$(id -u)" -ne 0 ] && printf 'Please run as root!\n' && exit 1
f="/var/log/conntrack.log" f="/var/log/conntrack.log"

2
bin/envs.net/envs_conntracks.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
[[ "$EUID" -ne 0 ]] && printf 'Please run as root!\n' && exit 1 [ "$(id -u)" -ne 0 ] && printf 'Please run as root!\n' && exit 1
log_file='/var/log/envs_conntrack.log' log_file='/var/log/envs_conntrack.log'

6
bin/envs.net/envs_gemini_genpage.sh
View File

@ -4,7 +4,7 @@
# - this script is called by /etc/cron.d/envs_gemini # - this script is called by /etc/cron.d/envs_gemini
# #
[[ "$EUID" -ne 0 ]] && printf 'Please run as root!\n' && exit 1 [ "$(id -u)" -ne 0 ] && printf 'Please run as root!\n' && exit 1
### ###
@ -12,10 +12,10 @@ userlist() {
mapfile -t users < <(jq -Mr '.data.users|keys[]' /var/www/envs.net/users_info.json) mapfile -t users < <(jq -Mr '.data.users|keys[]' /var/www/envs.net/users_info.json)
for USERNAME in "${users[@]}"; do for USERNAME in "${users[@]}"; do
if [ -f /home/"$USERNAME"/public_gemini/index.gmi ]; then if [ -f /home/"$USERNAME"/public_gemini/index.gmi ]; then
[[ ! -L /var/gemini/\~"$USERNAME" ]] && ln -s /home/"$USERNAME"/public_gemini /var/gemini/\~"$USERNAME" [ ! -L /var/gemini/\~"$USERNAME" ] && ln -s /home/"$USERNAME"/public_gemini /var/gemini/\~"$USERNAME"
printf '=> gemini://envs.net/~%s/ ~%s\n' "$USERNAME" "$USERNAME" printf '=> gemini://envs.net/~%s/ ~%s\n' "$USERNAME" "$USERNAME"
else else
[[ -L /var/gemini/\~"$USERNAME" ]] && unlink /var/gemini/\~"$USERNAME" [ -L /var/gemini/\~"$USERNAME" ] && unlink /var/gemini/\~"$USERNAME"
fi fi
done done
} }

2
bin/envs.net/envs_stats.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
[[ "$EUID" -ne 0 ]] && printf 'Please run as root!\n' && exit 1 [ "(id -u)" -ne 0 ] && printf 'Please run as root!\n' && exit 1
test ! -f /var/www/envs.net/stats/ && mkdir -p /var/www/envs.net/stats/ test ! -f /var/www/envs.net/stats/ && mkdir -p /var/www/envs.net/stats/

26
bin/envs.net/envs_user_updated.sh
View File

@ -7,7 +7,7 @@ WWW_PATH='/var/www/envs.net'
DOMAIN="envs.net" DOMAIN="envs.net"
[[ "$EUID" -ne 0 ]] && printf 'Please run as root!\n' && exit 1 [ "$(id -u)" -ne 0 ] && printf 'Please run as root!\n' && exit 1
# #
# user_updates.php # user_updates.php
@ -56,10 +56,10 @@ EOM
"email": "$USERNAME@$DOMAIN", "email": "$USERNAME@$DOMAIN",
EOM EOM
# desc # desc
if [[ -f "$INFO_FILE" ]]; then if [ -f "$INFO_FILE" ]; then
desc="$(sed -n '/^desc=/{s#^.*=##;p}' "$INFO_FILE")" desc="$(sed -n '/^desc=/{s#^.*=##;p}' "$INFO_FILE")"
if [[ -z "$desc" ]] || [[ "$desc" == 'a short describtion or message' ]]; then if [ -z "$desc" ] || [ "$desc" == 'a short describtion or message' ]; then
cat << EOM >> "$TMP_JSON" cat << EOM >> "$TMP_JSON"
"desc": "", "desc": "",
EOM EOM
@ -74,7 +74,7 @@ EOM
EOM EOM
fi fi
# website # website
if [[ -f "$USER_HOME"/public_html/index.php ]] || [[ "$(test -f "$USER_HOME"/public_html/index.*htm*; echo $?)" -eq 0 ]]; then if [ -f "$USER_HOME"/public_html/index.php ] || [ "$(test -f "$USER_HOME"/public_html/index.*htm*; echo $?)" -eq 0 ]; then
cat << EOM >> "$TMP_JSON" cat << EOM >> "$TMP_JSON"
"website": "https://$DOMAIN/~$USERNAME/", "website": "https://$DOMAIN/~$USERNAME/",
EOM EOM
@ -102,7 +102,7 @@ EOM
EOM EOM
fi fi
# blog # blog
if [[ "$(find "$USER_HOME"/public_html/blog/ -maxdepth 1 2>/dev/null | wc -l)" -ge 3 ]]; then if [ "$(find "$USER_HOME"/public_html/blog/ -maxdepth 1 2>/dev/null | wc -l)" -ge 3 ]; then
cat << EOM >> "$TMP_JSON" cat << EOM >> "$TMP_JSON"
"blog": "https://$DOMAIN/~$USERNAME/blog/", "blog": "https://$DOMAIN/~$USERNAME/blog/",
EOM EOM
@ -112,7 +112,7 @@ EOM
EOM EOM
fi fi
# twtwt # twtwt
if [[ -f "$USER_HOME"/public_html/twtxt.txt ]]; then if [ -f "$USER_HOME"/public_html/twtxt.txt ]; then
cat << EOM >> "$TMP_JSON" cat << EOM >> "$TMP_JSON"
"twtxt": "https://$DOMAIN/~$USERNAME/twtxt.txt", "twtxt": "https://$DOMAIN/~$USERNAME/twtxt.txt",
EOM EOM
@ -122,7 +122,7 @@ EOM
EOM EOM
fi fi
# user custom infos from .envs file (max. 10 entrys) # user custom infos from .envs file (max. 10 entrys)
if [[ -f "$INFO_FILE" ]]; then if [ -f "$INFO_FILE" ]; then
count_entry='0' # use to limit entrys count_entry='0' # use to limit entrys
count_field_entry='0' # use to separat array line by line count_field_entry='0' # use to separat array line by line
@ -132,13 +132,13 @@ EOM
# check 'INFO_FILE' and add entrys to 'line_to_set' array # check 'INFO_FILE' and add entrys to 'line_to_set' array
while read -r LINE ; do while read -r LINE ; do
if [[ -n "$LINE" ]] && ! [[ "$LINE" = '#'* ]] && ! [[ "$LINE" = 'desc='* ]]; then if [ -n "$LINE" ] && ! [ "$LINE" = '#'* ] && ! [ "$LINE" = 'desc='* ]; then
user_field="${LINE//=*/}" user_field="${LINE//=*/}"
user_value="${LINE//*=/}" user_value="${LINE//*=/}"
if ! [[ ":${field_exists[*]}:" =~ $user_field ]]; then if ! [ ":${field_exists[*]}:" =~ $user_field ]; then
# entry will be a single line # entry will be a single line
count_entry="$(( "$count_entry" + 1 ))"; [[ "$count_entry" -le '10' ]] || continue count_entry="$(( "$count_entry" + 1 ))"; [ "$count_entry" -le '10' ] || continue
field_exists+=( "$user_field" ) field_exists+=( "$user_field" )
line_to_set["$user_field","$count_field_entry"]+="$user_value" line_to_set["$user_field","$count_field_entry"]+="$user_value"
else else
@ -174,7 +174,7 @@ EOM
if [[ ":${field_is_array[*]}:" =~ $field_name ]]; then if [[ ":${field_is_array[*]}:" =~ $field_name ]]; then
# begin of user def. array # begin of user def. array
if ! [[ "$field_in_progress" = "$field_name" ]]; then if ! [ "$field_in_progress" = "$field_name" ]; then
field_in_progress="$field_name" field_in_progress="$field_name"
cat << EOM >> "$TMP_JSON" cat << EOM >> "$TMP_JSON"
@ -186,7 +186,7 @@ EOM
cat << EOM >> "$TMP_JSON" cat << EOM >> "$TMP_JSON"
"${line_to_set[$field]}", "${line_to_set[$field]}",
EOM EOM
if [[ "$field_count" -eq '0' ]]; then if [ "$field_count" -eq '0' ]; then
# end of user def. array # end of user def. array
# remove trailing ',' on last user entry # remove trailing ',' on last user entry
unset field_in_progress unset field_in_progress
@ -204,7 +204,7 @@ EOM
"ssh-pubkey": [ "ssh-pubkey": [
EOM EOM
while read -r LINE ; do while read -r LINE ; do
[[ "$LINE" == 'ssh'* ]] && printf '\t\r\t\r\t\r\t\r\t"%s",\n' "$LINE" >> "$TMP_JSON" [ "$LINE" == 'ssh'* ] && printf '\t\r\t\r\t\r\t\r\t"%s",\n' "$LINE" >> "$TMP_JSON"
done < "$USER_HOME"/.ssh/authorized_keys done < "$USER_HOME"/.ssh/authorized_keys
# remove trailing ',' for the last pubkey # remove trailing ',' for the last pubkey
sed -i '$ s/,$//' "$TMP_JSON" sed -i '$ s/,$//' "$TMP_JSON"

10
bin/envs_mysql.sh
View File

@ -13,7 +13,7 @@ print_usage() {
} }
backup() { backup() {
[[ -z "$DB" ]] && DB="$USER" [ -z "$DB" ] && DB="$USER"
test ! -d "$BACKUP_DIR" && mkdir -p "$BACKUP_DIR" && chmod 700 "$BACKUP_DIR" test ! -d "$BACKUP_DIR" && mkdir -p "$BACKUP_DIR" && chmod 700 "$BACKUP_DIR"
mysqldump -u "$USER" "$DB" -p | gzip -c > "$BACKUP_DIR"/db_"$(date +%F.%H%M%S)".sql.gz mysqldump -u "$USER" "$DB" -p | gzip -c > "$BACKUP_DIR"/db_"$(date +%F.%H%M%S)".sql.gz
@ -21,9 +21,9 @@ backup() {
} }
restore() { restore() {
if [[ -z "$DB" ]]; then if [ -z "$DB" ]; then
latest=''; for f in "$BACKUP_DIR"/db_*.gz; do [[ "$f" -nt "$latest" ]] && latest="$f"; done latest=''; for f in "$BACKUP_DIR"/db_*.gz; do [ "$f" -nt "$latest" ] && latest="$f"; done
[[ -z "$latest" ]] && printf 'no restore file found in %s!\n' "$BACKUP_DIR" && exit 0 [ -z "$latest" ] && printf 'no restore file found in %s!\n' "$BACKUP_DIR" && exit 0
DB="$latest" DB="$latest"
gunzip < "$DB" | mysql -u "$USER" "$USER" -p gunzip < "$DB" | mysql -u "$USER" "$USER" -p
else else
@ -31,7 +31,7 @@ restore() {
fi fi
} }
[[ $# -lt 1 ]] && print_usage && exit 1 [ $# -lt 1 ] && print_usage && exit 1
case "$CMD" in case "$CMD" in
backup*) backup;; backup*) backup;;