Domů Procházet Nápověda
Přihlásit se
yunoadmin
/
pihole_ynh
1
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

Unecessary send_readme_to_admin ...

Alexandre Aubin před 2 roky
rodič
6a57a14dae
revize
3a9e8b356f
4 změnil soubory, kde provedl 0 přidání a 218 odebrání
Jednotné zobrazení Ukázat statistiku rozdílových dat
  1. 0 141
      scripts/_common.sh
  2. 0 24
      scripts/install
  3. 0 24
      scripts/restore
  4. 0 29
      scripts/upgrade

+ 0 - 141
scripts/_common.sh
Zobrazit soubor 

@@ -27,147 +27,6 @@ PI_HOLE_BIN_DIR="/usr/local/bin"
 
 # EXPERIMENTAL HELPERS
 
 # EXPERIMENTAL HELPERS
 
 #=================================================
 
 #=================================================
 
 
 
-# Send an email to inform the administrator
 
-#
 
-# usage: ynh_send_readme_to_admin --app_message=app_message [--recipients=recipients] [--type=type]
 
-# | arg: -m --app_message= - The file with the content to send to the administrator.
 
-# | arg: -r, --recipients= - The recipients of this email. Use spaces to separate multiples recipients. - default: root
 
-#	example: "root admin@domain"
 
-#	If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you
 
-#	example: "root admin@domain user1 user2"
 
-# | arg: -t, --type= - Type of mail, could be 'backup', 'change_url', 'install', 'remove', 'restore', 'upgrade'
 
-ynh_send_readme_to_admin() {
 
-	# Declare an array to define the options of this helper.
 
-	declare -Ar args_array=( [m]=app_message= [r]=recipients= [t]=type= )
 
-	local app_message
 
-	local recipients
 
-	local type
 
-	# Manage arguments with getopts
 
-
 
-	ynh_handle_getopts_args "$@"
 
-	app_message="${app_message:-}"
 
-	recipients="${recipients:-root}"
 
-	type="${type:-install}"
 
-
 
-	# Get the value of admin_mail_html
 
-	admin_mail_html=$(ynh_app_setting_get $app admin_mail_html)
 
-	admin_mail_html="${admin_mail_html:-0}"
 
-
 
-	# Retrieve the email of users
 
-	find_mails () {
 
-		local list_mails="$1"
 
-		local mail
 
-		local recipients=" "
 
-		# Read each mail in argument
 
-		for mail in $list_mails
 
-		do
 
-			# Keep root or a real email address as it is
 
-			if [ "$mail" = "root" ] || echo "$mail" | grep --quiet "@"
 
-			then
 
-				recipients="$recipients $mail"
 
-			else
 
-				# But replace an user name without a domain after by its email
 
-				if mail=$(ynh_user_get_info "$mail" "mail" 2> /dev/null)
 
-				then
 
-					recipients="$recipients $mail"
 
-				fi
 
-			fi
 
-		done
 
-		echo "$recipients"
 
-	}
 
-	recipients=$(find_mails "$recipients")
 
-
 
-	# Subject base
 
-	local mail_subject="☁️🆈🅽🅷☁️: \`$app\`"
 
-
 
-	# Adapt the subject according to the type of mail required.
 
-	if [ "$type" = "backup" ]; then
 
-		mail_subject="$mail_subject has just been backup."
 
-	elif [ "$type" = "change_url" ]; then
 
-		mail_subject="$mail_subject has just been moved to a new URL!"
 
-	elif [ "$type" = "remove" ]; then
 
-		mail_subject="$mail_subject has just been removed!"
 
-	elif [ "$type" = "restore" ]; then
 
-		mail_subject="$mail_subject has just been restored!"
 
-	elif [ "$type" = "upgrade" ]; then
 
-		mail_subject="$mail_subject has just been upgraded!"
 
-	else	# install
 
-		mail_subject="$mail_subject has just been installed!"
 
-	fi
 
-
 
-	local mail_message="This is an automated message from your beloved YunoHost server.
 
-
 
-Specific information for the application $app.
 
-
 
-$(if [ -n "$app_message" ]
 
-then
 
-	cat "$app_message"
 
-else
 
-	echo "...No specific information..."
 
-fi)
 
-
 
----
 
-Automatic diagnosis data from YunoHost
 
-
 
-__PRE_TAG1__$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')__PRE_TAG2__"
 
-
 
-	# Store the message into a file for further modifications.
 
-	echo "$mail_message" > mail_to_send
 
-
 
-	# If a html email is required. Apply html tags to the message.
 
- 	if [ "$admin_mail_html" -eq 1 ]
 
- 	then
 
-		# Insert 'br' tags at each ending of lines.
 
-		ynh_replace_string "$" "<br>" mail_to_send
 
-
 
-		# Insert starting HTML tags
 
-		sed --in-place '1s@^@<!DOCTYPE html>\n<html>\n<head></head>\n<body>\n@' mail_to_send
 
-
 
-		# Keep tabulations
 
-		ynh_replace_string "  " "\&#160;\&#160;" mail_to_send
 
-		ynh_replace_string "\t" "\&#160;\&#160;" mail_to_send
 
-
 
-		# Insert url links tags
 
-		ynh_replace_string "__URL_TAG1__\(.*\)__URL_TAG2__\(.*\)__URL_TAG3__" "<a href=\"\2\">\1</a>" mail_to_send
 
-
 
-		# Insert pre tags
 
-		ynh_replace_string "__PRE_TAG1__" "<pre>" mail_to_send
 
-		ynh_replace_string "__PRE_TAG2__" "<\pre>" mail_to_send
 
-
 
-		# Insert finishing HTML tags
 
-		echo -e "\n</body>\n</html>" >> mail_to_send
 
-
 
-	# Otherwise, remove tags to keep a plain text.
 
-	else
 
-		# Remove URL tags
 
-		ynh_replace_string "__URL_TAG[1,3]__" "" mail_to_send
 
-		ynh_replace_string "__URL_TAG2__" ": " mail_to_send
 
-
 
-		# Remove PRE tags
 
-		ynh_replace_string "__PRE_TAG[1-2]__" "" mail_to_send
 
-	fi
 
-
 
-	# Define binary to use for mail command
 
-	if [ -e /usr/bin/bsd-mailx ]
 
-	then
 
-		local mail_bin=/usr/bin/bsd-mailx
 
-	else
 
-		local mail_bin=/usr/bin/mail.mailutils
 
-	fi
 
-
 
-	if [ "$admin_mail_html" -eq 1 ]
 
-	then
 
-		content_type="text/html"
 
-	else
 
-		content_type="text/plain"
 
-	fi
 
-
 
-	# Send the email to the recipients
 
-	cat mail_to_send | $mail_bin -a "Content-Type: $content_type; charset=UTF-8" -s "$mail_subject" "$recipients"
 
-}
 
-
 
-#=================================================
 
-
 
 ynh_maintenance_mode_ON () {
 
 ynh_maintenance_mode_ON () {
 
 	# Load value of $path_url and $domain from the config if their not set
 
 	# Load value of $path_url and $domain from the config if their not set
 
 	if [ -z $path_url ]; then
 
 	if [ -z $path_url ]; then

+ 0 - 24
scripts/install
Zobrazit soubor 

@@ -341,30 +341,6 @@ ynh_script_progression --message="Reloading NGINX web server..." --weight=3
 
 
 
 ynh_systemd_action --service_name=nginx --action=reload
 
 ynh_systemd_action --service_name=nginx --action=reload
 
 
 
-#=================================================
 
-# SEND A README FOR THE ADMIN
 
-#=================================================
 
-
 
-# Get main domain and buid the url of the admin panel of the app.
 
-admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app"
 
-
 
-if [ $enable_dhcp -eq 1 ]
 
-then
 
-	dhcp_alert="You asked to use the internal DHCP server of dnsmasq with Pi-hole.
 
-You should really read the __URL_TAG1__documentation about that__URL_TAG2__https://github.com/YunoHost-Apps/pihole_ynh/blob/master/dhcp.md__URL_TAG3__
 
-
 
-"
 
-else
 
-	dhcp_alert=""
 
-fi
 
-
 
-echo "${dhcp_alert}You can configure this app easily by using the experimental __URL_TAG1__config-panel feature__URL_TAG2__$admin_panel/config-panel__URL_TAG3__.
 
-You can also find some specific actions for this app by using the experimental __URL_TAG1__action feature__URL_TAG2__$admin_panel/actions__URL_TAG3__.
 
-
 
-If you're facing an issue or want to improve this app, please open a new issue in this __URL_TAG1__project__URL_TAG2__https://github.com/YunoHost-Apps/pihole_ynh__URL_TAG3__." > mail_to_send
 
-
 
-ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=install
 
-
 
 #=================================================
 
 #=================================================
 
 # END OF SCRIPT
 
 # END OF SCRIPT
 
 #=================================================
 
 #=================================================

+ 0 - 24
scripts/restore
Zobrazit soubor 

@@ -260,30 +260,6 @@ ynh_script_progression --message="Disabling maintenance mode..." --weight=4
 
 
 
 ynh_maintenance_mode_OFF
 
 ynh_maintenance_mode_OFF
 
 
 
-#=================================================
 
-# SEND A README FOR THE ADMIN
 
-#=================================================
 
-
 
-# Get main domain and buid the URL of the admin panel of the app.
 
-admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app"
 
-
 
-if [ $enable_dhcp -eq 1 ]
 
-then
 
-	dhcp_alert="You asked to use the internal DHCP server of Dnsmasq with Pi-hole.
 
-You should really read the __URL_TAG1__documentation about that__URL_TAG2__https://github.com/YunoHost-Apps/pihole_ynh/blob/master/dhcp.md__URL_TAG3__
 
-
 
-"
 
-else
 
-	dhcp_alert=""
 
-fi
 
-
 
-echo "${dhcp_alert}You can configure this app easily by using the experimental __URL_TAG1__config-panel feature__URL_TAG2__$admin_panel/config-panel__URL_TAG3__.
 
-You can also find some specific actions for this app by using the experimental __URL_TAG1__action feature__URL_TAG2__$admin_panel/actions__URL_TAG3__.
 
-
 
-If you're facing an issue or want to improve this app, please open a new issue in this __URL_TAG1__project__URL_TAG2__https://github.com/YunoHost-Apps/pihole_ynh__URL_TAG3__." > mail_to_send
 
-
 
-ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=restore
 
-
 
 #=================================================
 
 #=================================================
 
 # END OF SCRIPT
 
 # END OF SCRIPT
 
 #=================================================
 
 #=================================================

+ 0 - 29
scripts/upgrade
Zobrazit soubor 

@@ -368,35 +368,6 @@ ynh_script_progression --message="Disabling maintenance mode..." --weight=5
 
 
 
 ynh_maintenance_mode_OFF
 
 ynh_maintenance_mode_OFF
 
 
 
-#=================================================
 
-# SEND A README FOR THE ADMIN
 
-#=================================================
 
-
 
-# Get main domain and buid the url of the admin panel of the app.
 
-admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app"
 
-
 
-if [ $enable_dhcp -eq 1 ]
 
-then
 
-	dhcp_alert="You asked to use the internal DHCP server of dnsmasq with Pi-hole.
 
-You should really read the documentation about that, https://github.com/YunoHost-Apps/pihole_ynh/blob/master/dhcp.md
 
-
 
-"
 
-else
 
-	dhcp_alert=""
 
-fi
 
-
 
-echo "${dhcp_alert}You can configure this app easily by using the experimental __URL_TAG1__config-panel feature__URL_TAG2__$admin_panel/config-panel__URL_TAG3__.
 
-You can also find some specific actions for this app by using the experimental __URL_TAG1__action feature__URL_TAG2__$admin_panel/actions__URL_TAG3__.
 
-
 
-If you're facing an issue or want to improve this app, please open a new issue in this __URL_TAG1__project__URL_TAG2__https://github.com/YunoHost-Apps/pihole_ynh__URL_TAG3__.
 
-
 
----
 
-
 
-Changelog since your last upgrade:
 
-$(cat changelog)" > mail_to_send
 
-
 
-ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=upgrade
 
-
 
 #=================================================
 
 #=================================================
 
 # END OF SCRIPT
 
 # END OF SCRIPT
 
 #=================================================
 
 #=================================================