diff --git a/conf/nginx.conf b/conf/nginx.conf index 72a93f9..8facb26 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -28,6 +28,7 @@ location /assets { } location /internal/gfonts/css { + resolver 8.8.8.8 ipv6=off valid=30s; proxy_pass https://fonts.googleapis.com/css?$args; proxy_hide_header Access-Control-Allow-Origin; proxy_hide_header Cross-Origin-Resource-Policy; @@ -71,6 +72,7 @@ location /ws/notifications { location / { location ~ ^/internal/gfonts/font/(?.+) { + resolver 8.8.8.8 ipv6=off valid=30s; proxy_pass https://fonts.gstatic.com/s/$font_file; proxy_hide_header Access-Control-Allow-Origin; diff --git a/scripts/restore b/scripts/restore index d024956..e68669e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -42,6 +42,14 @@ ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./d #================================================= ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 +# Use logrotate to manage application logfile(s) +mkdir -p /var/log/$app +touch /var/log/$app/$app-backend.log +touch /var/log/$app/$app-exporter.log +chown -R $app: /var/log/$app + +ynh_restore_file --origin_path="/etc/logrotate.d/$app" + ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/systemd/system/$app-backend.service" @@ -54,8 +62,6 @@ systemctl enable $app-exporter.service --quiet yunohost service add $app-exporter --log="/var/log/$app/$app-exporter.log" -ynh_restore_file --origin_path="/etc/logrotate.d/$app" - #================================================= # RELOAD NGINX AND PHP-FPM OR THE APP SERVICE #=================================================