diff --git a/config_panel.toml.example b/config_panel.toml.example index d8518a1..1c3cfad 100644 --- a/config_panel.toml.example +++ b/config_panel.toml.example @@ -1,4 +1,4 @@ -version = "0.1" +version = "1.0" name = "PiHole configuration panel" [main] diff --git a/scripts/install b/scripts/install index 20dc843..c1a968c 100644 --- a/scripts/install +++ b/scripts/install @@ -353,7 +353,7 @@ admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4) 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 __URL_TAG1__documentation about that__URL_TAG2__https://github.com/YunoHost-Apps/pihole_ynh/blob/master/dhcp.md__URL_TAG3__ " diff --git a/scripts/restore b/scripts/restore index 035e777..04f3281 100644 --- a/scripts/restore +++ b/scripts/restore @@ -274,12 +274,12 @@ ynh_maintenance_mode_OFF # SEND A README FOR THE ADMIN #================================================= -# Get main domain and buid the url of the admin panel of the app. +# 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 PiHole. + 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__ " diff --git a/scripts/upgrade b/scripts/upgrade index 8286065..adbed2c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -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 "