|
|
@@ -152,11 +152,11 @@ ynh_install_app_dependencies $pkg_dependencies
|
|
|
# PHP-FPM CONFIGURATION
|
|
|
#=================================================
|
|
|
|
|
|
-# Overwrite the php-fpm configuration only if it's allowed
|
|
|
+# Overwrite the PHP-FPM configuration only if it's allowed
|
|
|
if [ $overwrite_phpfpm -eq 1 ]
|
|
|
then
|
|
|
ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=3
|
|
|
- # Create a dedicated php-fpm config
|
|
|
+ # Create a dedicated PHP-FPM config
|
|
|
ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --dedicated_service
|
|
|
fi
|
|
|
|
|
|
@@ -164,7 +164,7 @@ fi
|
|
|
# NGINX CONFIGURATION
|
|
|
#=================================================
|
|
|
|
|
|
-# Overwrite the nginx configuration only if it's allowed
|
|
|
+# Overwrite the NGINX configuration only if it's allowed
|
|
|
if [ $overwrite_nginx -eq 1 ]
|
|
|
then
|
|
|
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
|
|
|
@@ -252,7 +252,7 @@ ynh_replace_string --match_string="59 1 " --replace_string="$((1 + RANDOM % 58))
|
|
|
# Randomize update checker time
|
|
|
ynh_replace_string --match_string="59 17" --replace_string="$((1 + RANDOM % 58)) $((12 + RANDOM % 8))" --target_file="/etc/cron.d/pihole"
|
|
|
|
|
|
-# Remove git usage for version. Which fails because we use here a release instead of master.
|
|
|
+# Remove Git usage for version. Which fails because we use here a release instead of master.
|
|
|
ynh_replace_string --match_string=".*updatechecker.*" --replace_string="#&" --target_file=/etc/cron.d/pihole
|
|
|
|
|
|
#=================================================
|
|
|
@@ -418,7 +418,7 @@ ynh_maintenance_mode_OFF
|
|
|
# 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 a html email is required. Apply html to the changelog.
|
|
|
+# If a HTML email is required. Apply HTML to the changelog.
|
|
|
if [ "$admin_mail_html" -eq 1 ]; then
|
|
|
format=html
|
|
|
else
|
|
|
@@ -428,7 +428,7 @@ ynh_app_changelog --format=$format
|
|
|
|
|
|
if [ $enable_dhcp -eq 1 ]
|
|
|
then
|
|
|
- dhcp_alert="You asked to use the internal DHCP server of dnsmasq with PiHole.
|
|
|
+ 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
|
|
|
|
|
|
"
|
Éric Gaspar