From 34738652a6e44277408c862b5fc57745d966fbed Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Thu, 21 Sep 2017 09:59:10 +0200
Subject: [PATCH] Remove apps-enabled folder and useless removal

---
 check_process      | 3 +--
 conf/cron_weblate  | 6 +++---
 conf/uwsgi_service | 2 +-
 scripts/install    | 4 ----
 scripts/remove     | 8 --------
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/check_process b/check_process
index aa526a0..672bc7c 100644
--- a/check_process
+++ b/check_process
@@ -8,7 +8,6 @@
 		domain="domain.tld"	(DOMAIN)
 		path="/path"	(PATH)
 		admin="john"	(USER)
-		language="fr"
 		is_public=1	(PUBLIC|public=1|private=0)
   	password="pass"
 	; Checks
@@ -18,7 +17,7 @@
 		setup_nourl=0
 		setup_private=1
 		setup_public=1
-		upgrade=0
+		upgrade=1
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=1
diff --git a/conf/cron_weblate b/conf/cron_weblate
index 1358532..47427a2 100644
--- a/conf/cron_weblate
+++ b/conf/cron_weblate
@@ -1,9 +1,9 @@
 # https://docs.weblate.org/en/latest/admin/install.html#production-cron
 # Fulltext index updates
-10 * * * * root cd "__FINALPATH__" && source __FINALPATH__/venv/bin/activate && DJANGO_SETTINGS_MODULE="weblate.settings" weblate update_index
+10 * * * * root source __FINALPATH__/venv/bin/activate && DJANGO_SETTINGS_MODULE="weblate.settings" weblate update_index
 
 # Cleanup stale objects
-@daily root cd "__FINALPATH__" && source __FINALPATH__/venv/bin/activate && DJANGO_SETTINGS_MODULE="weblate.settings" weblate cleanuptrans
+@daily root source __FINALPATH__/venv/bin/activate && DJANGO_SETTINGS_MODULE="weblate.settings" weblate cleanuptrans
 
 # Commit pending changes after 96 hours
-@hourly root cd "__FINALPATH__" && source __FINALPATH__/venv/bin/activate && DJANGO_SETTINGS_MODULE="weblate.settings" weblate commit_pending --all --age=96 --verbosity=0
+@hourly root source __FINALPATH__/venv/bin/activate && DJANGO_SETTINGS_MODULE="weblate.settings" weblate commit_pending --all --age=96 --verbosity=0
diff --git a/conf/uwsgi_service b/conf/uwsgi_service
index 5a80c1f..20ff4aa 100644
--- a/conf/uwsgi_service
+++ b/conf/uwsgi_service
@@ -9,7 +9,7 @@ Group=__NAME__
 RemainAfterExit=yes
 WorkingDirectory=__FINALPATH__
 ExecStart=/usr/bin/uwsgi \
-	  --ini /etc/uwsgi/apps-enabled/__NAME__.ini \
+	  --ini __FINALPATH_/uwsgi.ini \
 	  --socket __FINALPATH__/socket
 Restart=always
 StandardError=syslog
diff --git a/scripts/install b/scripts/install
index 9ec6913..fcd273f 100755
--- a/scripts/install
+++ b/scripts/install
@@ -115,10 +115,6 @@ cp ../conf/uwsgi.ini "$final_path/uwsgi.ini"
 ynh_replace_string "__NAME__" "$app" "$final_path/uwsgi.ini"
 ynh_replace_string "__FINALPATH__" "$final_path" "$final_path/uwsgi.ini"
 
-# Config service
-mkdir -p /etc/uwsgi/apps-enabled/
-ln -s "$final_path/uwsgi.ini" "/etc/uwsgi/apps-enabled/$app.ini"
-
 cp ../conf/uwsgi_service "/etc/systemd/system/$app.service"
 ynh_replace_string "__NAME__" "$app" "/etc/systemd/system/$app.service"
 ynh_replace_string "__FINALPATH__" "$final_path" "/etc/systemd/system/$app.service"
diff --git a/scripts/remove b/scripts/remove
index dc1f1a6..9a1aae5 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -73,18 +73,10 @@ ynh_remove_logrotate
 # Remove a cron file
 ynh_secure_remove "/etc/cron.d/$app"
 
-# Remove a directory securely
-ynh_secure_remove "/etc/$app/"
-
-# Remove the log files
-ynh_secure_remove "/var/log/$app/"
-
 #=================================================
 # REMOVE uwsgi and systemd files
 #=================================================
 
-ynh_secure_remove "/etc/uwsgi/apps-enabled/$app.ini"
-
 ynh_secure_remove "/etc/systemd/system/$app.service"
 
 #=================================================