From e5acb27430fc57b38259af5aee46d0c8686c1483 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 22 Mar 2022 15:52:47 +0100
Subject: [PATCH] Fix

---
 check_process                      | 4 +---
 conf/config.ini                    | 2 +-
 conf/cron                          | 3 ---
 conf/nginx.conf                    | 3 ---
 manifest.json                      | 4 ++--
 scripts/upgrade                    | 2 +-
 sources/extra_files/app/.gitignore | 2 --
 sources/patches/.gitignore         | 2 --
 8 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 sources/extra_files/app/.gitignore
 delete mode 100644 sources/patches/.gitignore

diff --git a/check_process b/check_process
index e2909a8..86d519e 100644
--- a/check_process
+++ b/check_process
@@ -2,9 +2,7 @@
 	; Manifest
 		domain="domain.tld"
 		path="/path"
-		admin="john"
 		is_public=1
-		password="1Strong-Password"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=0
@@ -13,7 +11,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=CommitHash
+		#upgrade=1	from_commit=CommitHash
 		backup_restore=1
 		multi_instance=1
 		change_url=1
diff --git a/conf/config.ini b/conf/config.ini
index 3312648..497c1ea 100644
--- a/conf/config.ini
+++ b/conf/config.ini
@@ -1,3 +1,3 @@
 [globals]
 db_type=sqlite
-db_file=__FINALPATH__/selfoss.db
+db_file=__FINALPATH__/database.db
diff --git a/conf/cron b/conf/cron
index 15f2045..ab26732 100644
--- a/conf/cron
+++ b/conf/cron
@@ -1,4 +1 @@
 */15 * * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/cliupdate.php >>/var/log/selfoss_update.log > /dev/null
-
-
-#*/30 * * * * /usr/bin/curl -Ls 'http://__DOMAIN____PATH__/update' >/dev/null
\ No newline at end of file
diff --git a/conf/nginx.conf b/conf/nginx.conf
index a705a85..f98a6c8 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -25,7 +25,4 @@ location / {
   location ~* ^/(data\/logs|data\/sqlite|config\.ini|\.ht) {
         deny all;
     }
-
-  # Include SSOWAT user panel.
-  include conf.d/yunohost_panel.conf.inc;
 }
diff --git a/manifest.json b/manifest.json
index febed46..0cabc5e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,8 +17,8 @@
     },
     "license": "AGPL-3.0-only",
     "maintainer": {
-        "name": "John doe",
-        "email": "john.doe@example.com"
+        "name": "",
+        "email": ""
     },
     "requirements": {
         "yunohost": ">= 4.3.0"
diff --git a/scripts/upgrade b/scripts/upgrade
index b50ede6..12efa7d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -97,7 +97,7 @@ ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/defaults.ini" --destination="$final_path/config.ini"
+ynh_add_config --template="../conf/config.ini" --destination="$final_path/config.ini"
 
 chmod 400 "$final_path/config.ini"
 chown $app:$app "$final_path/config.ini"
diff --git a/sources/extra_files/app/.gitignore b/sources/extra_files/app/.gitignore
deleted file mode 100644
index 783a4ae..0000000
--- a/sources/extra_files/app/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-*.sw[op]
diff --git a/sources/patches/.gitignore b/sources/patches/.gitignore
deleted file mode 100644
index 783a4ae..0000000
--- a/sources/patches/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-*.sw[op]