From 41da1daf0276f5f132c99ef7f402a613d8f05902 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 3 Feb 2024 18:39:02 +0100
Subject: [PATCH] nginx: remove old 'yunohost_panel.conf' stuff

---
 conf/nginx/yunohost_panel.conf.inc | 12 ------------
 hooks/conf_regen/15-nginx          |  9 ++-------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 conf/nginx/yunohost_panel.conf.inc

diff --git a/conf/nginx/yunohost_panel.conf.inc b/conf/nginx/yunohost_panel.conf.inc
deleted file mode 100644
index 69ca48a62..000000000
--- a/conf/nginx/yunohost_panel.conf.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is some old code that worked with the old portal
-# We need to rethink wether we want to keep something similar,
-# or drop the feature
-
-# # Insert YunoHost button + portal overlay
-# sub_filter </head> '<script type="text/javascript" src="/ynh_portal.js"></script><link type="text/css" rel="stylesheet" href="/ynh_overlay.css"><script type="text/javascript" src="/ynhtheme/custom_portal.js"></script><link type="text/css" rel="stylesheet" href="/ynhtheme/custom_overlay.css"></head>';
-# sub_filter_once on;
-# # Apply to other mime types than text/html
-# sub_filter_types application/xhtml+xml;
-# # Prevent YunoHost panel files from being blocked by specific app rules
-# location ~ (ynh_portal.js|ynh_overlay.css|ynh_userinfo.json|ynhtheme/custom_portal.js|ynhtheme/custom_overlay.css) {
-# }
diff --git a/hooks/conf_regen/15-nginx b/hooks/conf_regen/15-nginx
index 53f5b6d6a..e78b0f771 100755
--- a/hooks/conf_regen/15-nginx
+++ b/hooks/conf_regen/15-nginx
@@ -23,7 +23,6 @@ do_init_regen() {
     cp global.conf "$nginx_conf_dir"
     cp ssowat.conf "$nginx_conf_dir"
     cp yunohost_http_errors.conf.inc "$nginx_conf_dir"
-    cp yunohost_panel.conf.inc "$nginx_conf_dir"
     cp yunohost_sso.conf.inc "$nginx_conf_dir"
 
 
@@ -66,14 +65,10 @@ do_pre_regen() {
     cp global.conf "$nginx_conf_dir"
     cp ssowat.conf "$nginx_conf_dir"
     cp yunohost_http_errors.conf.inc "$nginx_conf_dir"
-    cp yunohost_panel.conf.inc "$nginx_conf_dir"
     cp yunohost_sso.conf.inc "$nginx_conf_dir"
 
-    # remove the panel overlay if this is specified in settings
-    panel_overlay="$(jq -r '.ssowat_panel_overlay_enabled' <<< "$YNH_SETTINGS" | int_to_bool)"
-    if [ "$panel_overlay" == "False" ]; then
-        echo "#" >"${nginx_conf_dir}/yunohost_panel.conf.inc"
-    fi
+    # Legacy file to remove
+    touch "$nginx_conf_dir"/yunohost_panel.conf.inc
 
     # retrieve variables
     main_domain=$(cat /etc/yunohost/current_host)