From 952228d2803e3573574b4a5b37b5c7f72fe934bd Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 6 Jul 2021 10:51:41 +0200
Subject: [PATCH] Fix

---
 check_process        | 29 +++--------------------------
 conf/app.src         | 10 +++++-----
 conf/config.dist.php | 28 +++++++++++++++++++++-------
 scripts/install      | 11 -----------
 4 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/check_process b/check_process
index 0cbeae3..eeeaa72 100644
--- a/check_process
+++ b/check_process
@@ -1,16 +1,8 @@
-# See here for more informations
-# https://github.com/YunoHost/package_check#syntax-check_process-file
-
-# Move this file from check_process.default to check_process when you have filled it.
-
 ;; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
-		path="/"	(PATH)	
-		is_public=1	(PUBLIC|public=1|private=0)
-#		password="pass"
-#		nextclouddomain="domain.tld"
-		port="9980"	(PORT)
+		domain="domain.tld"
+		path="/"
+		is_public=1
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=0
@@ -21,22 +13,7 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
-		incorrect_path=1
-		port_already_use=0
 		change_url=0
-;;; Levels
-	Level 1=auto
-	Level 2=auto
-	Level 3=auto
-# Level 4: 
-	Level 4=1 (This app supports the Nextcloud LDAP auth)
-# Level 5: 
-	Level 5=auto
-	Level 6=auto
-	Level 7=auto
-	Level 8=0
-	Level 9=0
-	Level 10=0
 ;;; Options
 Email=
 Notification=none
diff --git a/conf/app.src b/conf/app.src
index 70effec..8c16c58 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/phpipam/phpipam/archive/1.4.tar.gz
-SOURCE_SUM=57f3fe96f0147a74cb5c62da8b2f2d5c850d666e8db302ef1bcd2e860d85e73ba714fecadab79a390475567098a36362df4d7f3a694fcc3617248116f06c0696
-SOURCE_SUM_PRG=sha512sum
-SOURCE_FORMAT=tar.gz
+SOURCE_URL=https://github.com/phpipam/phpipam/releases/download/v1.4.3/phpipam-v1.4.3.zip
+SOURCE_SUM=f85b11399fc2fd3d3027e41bc7eecb89149454f3845fe1cda4c1e3722d16d00d
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
 SOURCE_EXTRACT=true
-SOURCE_FILENAME=phpipam.tar.gz
\ No newline at end of file
+SOURCE_FILENAME=phpipam.zip
diff --git a/conf/config.dist.php b/conf/config.dist.php
index 306ca74..439ae5f 100755
--- a/conf/config.dist.php
+++ b/conf/config.dist.php
@@ -4,21 +4,21 @@
  * database connection details
  ******************************/
 $db['host'] = 'localhost';
-$db['user'] = 'yunouser';
-$db['pass'] = 'yunopass';
-$db['name'] = 'yunobase';
+$db['user'] = '__DB_NAME__';
+$db['pass'] = '__DB_PWD__';
+$db['name'] = '__DB_NAME__';
 $db['port'] = 3306;
 
 /**
  * Database webhost settings
  *
- * Enable and change this setting if your MySQL database does not run on
- * localhost and you want to use the automatic database installation method
- * to create a database user for you (which by default is created @localhost)
+ * Change this setting if your MySQL database does not run on localhost
+ * and you want to use the automatic database installation method to
+ * create a database user for you (which by default is created @localhost)
  *
  * Set to the hostname or IP address of the webserver, or % to allow all
  ******************************/
-// $db['webhost'] = 'localhost';
+$db['webhost'] = '';
 
 
 /**
@@ -96,6 +96,13 @@ $api_allow_unsafe = false;
  ******************************/
 $phpsessname = "phpipam";
 
+/**
+ * Cookie SameSite settings ("None", "Lax"=Default, "Strict")
+ * - "Strict" increases security
+ * - "Lax" required for SAML2
+ * - "None" requires HTTPS
+ */
+$cookie_samesite = "Lax";
 
 /**
  * Session storage - files or database
@@ -176,3 +183,10 @@ $config['split_ip_custom_fields'] = false;                  // Show custom field
  * If multiple php versions are present; overide selection with $php_cli_binary.
  */
 // $php_cli_binary = '/usr/bin/php7.1';
+
+/**
+ * Path to mysqldump binary
+ *
+ * default: '/usr/bin/mysqldump'
+ */
+// $mysqldump_cli_binary = '/usr/bin/mysqldump';
diff --git a/scripts/install b/scripts/install
index 8fa4b5c..921d3ed 100644
--- a/scripts/install
+++ b/scripts/install
@@ -49,17 +49,6 @@ ynh_script_progression --message="Storing installation settings..." --time --wei
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# FIND AND OPEN A PORT
-#=================================================
-ynh_script_progression --message="Finding an available port..." --time --weight=1
-
-# Find an available port
-port=$(ynh_find_port --port=8095)
-ynh_app_setting_set --app=$app --key=port --value=$port
-
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================