From 8c1e5d1e8f905c4249888eec4b9314dc61c78fc2 Mon Sep 17 00:00:00 2001
From: Fabian Wilkens <wilkens.fabian+github@gmail.com>
Date: Fri, 8 Jan 2021 19:44:37 +0100
Subject: [PATCH] Preperation for extentions

---
 conf/env.sample |  3 +++
 conf/nginx.conf |  4 +---
 scripts/install | 28 ++++++++++++++++++++++++----
 scripts/upgrade | 12 ++++++++++++
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/conf/env.sample b/conf/env.sample
index f443916..338fc54 100644
--- a/conf/env.sample
+++ b/conf/env.sample
@@ -61,3 +61,6 @@ REVISIONS_FREQUENCY=300
 
 # Sub-URI
 RAILS_RELATIVE_URL_ROOT=/
+
+# Enable public file server
+RAILS_SERVE_STATIC_FILES=false
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7f58986..04d98b7 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -13,7 +13,5 @@ location __PATH__/ {
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_buffering off;
 
-    # Include SSOWAT user panel.
-    include conf.d/yunohost_panel.conf.inc;
-    more_clear_input_headers 'Accept-Encoding';
+    more_set_headers "X-Frame-Options" : "allow-from __ACCESS_DOMAIN__"
 }
diff --git a/scripts/install b/scripts/install
index a65509f..308e6dd 100755
--- a/scripts/install
+++ b/scripts/install
@@ -28,6 +28,13 @@ domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
 app=$YNH_APP_INSTANCE_NAME
+install_extensions=$YNH_APP_ARG_INSTALL_EXTENSIONS
+if [ $install_extensions -eq 0 ]
+then
+    access_domain=$domain
+else
+    access_domain=$YNH_APP_ARG_ACCESS_DOMAIN
+fi
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
@@ -46,6 +53,8 @@ ynh_script_progression --message="Storing installation settings..."  --weight=3
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=is_public --value=$is_public
+ynh_app_setting_set --app=$app --key=install_extensions --value=$install_extensions
+ynh_app_setting_set --app=$app --key=access_domain --value=$access_domain
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -92,7 +101,7 @@ ynh_setup_source  --dest_dir="$final_path/live"
 ynh_script_progression --message="Configuring nginx web server..."  --weight=3
 
 # Create a dedicated nginx config
-ynh_add_nginx_config "port"
+ynh_add_nginx_config "port access_domain"
 
 #=================================================
 # CREATE DEDICATED USER
@@ -145,8 +154,19 @@ pushd "$final_path/live"
     exec_as "$app" env PATH=$PATH /opt/rbenv/versions/$RUBY_VERSION/bin/bundle config set with 'development'
     exec_as "$app" env PATH=$PATH /opt/rbenv/versions/$RUBY_VERSION/bin/bundle install
     exec_as "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/$RUBY_VERSION/bin/bundle exec rails db:create db:migrate --quiet
+    exec_as "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/$RUBY_VERSION/bin/bundle exec rails assets:precompile --quiet
 popd
 
+#=================================================
+# INSTALLING Standard Notes - Extensions
+#=================================================
+if [ $install_extensions ]
+then
+    ynh_script_progression --message="Installing Standard Notes - Extensions..."  --weight=1
+
+    ynh_replace_string --match_string="RAILS_SERVE_STATIC_FILES=false" --replace_string="RAILS_SERVE_STATIC_FILES=$install_extensions" --target_file="$config_file"
+fi
+
 #=================================================
 # SETUP SYSTEMD
 #=================================================
@@ -210,9 +230,9 @@ ynh_script_progression --message="Configuring fail2ban..." --weight=1
 # Create a dedicated fail2ban config
 touch "/var/log/$app/$app.log"
 ynh_add_fail2ban_config --use_template --others_var="\
-	domain \
-	path_url \
-	"
+    domain \
+    path_url \
+    "
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/upgrade b/scripts/upgrade
index 549cb13..3c303fb 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -25,6 +25,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 port=$(ynh_app_setting_get --app=$app --key=port)
+access_domain=(ynh_app_setting_get --app=$app --key=access_domain)
 
 #=================================================
 # CHECK VERSION
@@ -179,9 +180,20 @@ then
         exec_as "$app" env PATH=$PATH /opt/rbenv/versions/$RUBY_VERSION/bin/bundle config set with 'development'
         exec_as "$app" env PATH=$PATH /opt/rbenv/versions/$RUBY_VERSION/bin/bundle install
         exec_as "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/$RUBY_VERSION/bin/bundle exec rails db:create db:migrate --quiet
+        exec_as "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/$RUBY_VERSION/bin/bundle exec rails assets:precompile --quiet
     popd
 fi
 
+#=================================================
+# INSTALLING Standard Notes - Extensions
+#=================================================
+if [ $install_extensions ]
+then
+    ynh_script_progression --message="Installing Standard Notes - Extensions..."  --weight=1
+
+    ynh_replace_string --match_string="RAILS_SERVE_STATIC_FILES=false" --replace_string="RAILS_SERVE_STATIC_FILES=true" --target_file="$config_file"
+fi
+
 #=================================================
 # SETUP SYSTEMD
 #=================================================