From a9aaac80a789affa4a1bfff64e4dbeb217d96436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 2 Jun 2023 20:36:12 +0200
Subject: [PATCH] fix

---
 manifest.toml   |   6 +--
 scripts/install | 106 ++++++++++++++++++++++++------------------------
 scripts/remove  |   2 +-
 3 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index ee9074a..04914ce 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -69,8 +69,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://framagit.org/yakforms/yakforms/-/archive/v1.1/yakforms-v1.1.tar.gz"
-        sha256 = "da30fbd9821f84f21f06b7604232f0dc9b6b6a39738bb5326ee875f173300045"
+        url = "https://packages.yakforms.org/yakforms_distribution_1.1.zip"
+        sha256 = "96c026e914b29ea81c8e86aeca2754af51314ca0529cf7d3005f75653827520b"
 
     [resources.system_user]
 
@@ -84,7 +84,7 @@ ram.runtime = "50M"
     admin.allowed = "admins"
 
     [resources.apt]
-    packages = "postgresql curl libzip-dev php8.2-fpm php8.2-cli php8.2-gd php8.2-xml php8.2-ldap php8.2-mbstring php8.2-pgsql"
+    packages = "postgresql php8.2-fpm php8.2-cli php8.2-gd php8.2-xml php8.2-ldap php8.2-mbstring php8.2-pgsql"
 
     [resources.database]
     type = "postgresql"
diff --git a/scripts/install b/scripts/install
index 80cb47d..b3d0e98 100644
--- a/scripts/install
+++ b/scripts/install
@@ -47,77 +47,77 @@ ynh_add_nginx_config
 #=================================================
 # CREATE DRUSH ALIAS
 #=================================================
-ynh_script_progression --message="Creating Drush alias..." --weight=2
+# ynh_script_progression --message="Creating Drush alias..." --weight=2
 
-mkdir -p "$install_dir/.drush"
-drush_aliasconfig="$install_dir/.drush/$app.aliases.drushrc.php"
+# mkdir -p "$install_dir/.drush"
+# drush_aliasconfig="$install_dir/.drush/$app.aliases.drushrc.php"
 
-ynh_add_config --template="../conf/yoursite.aliases.drushrc.php" --destination="$drush_aliasconfig"
+# ynh_add_config --template="../conf/yoursite.aliases.drushrc.php" --destination="$drush_aliasconfig"
 
-chmod 400 "$drush_aliasconfig"
-chown $app:$app "$drush_aliasconfig"
+# chmod 400 "$drush_aliasconfig"
+# chown $app:$app "$drush_aliasconfig"
 
 #=================================================
 # INSTALL COMPOSER
 #=================================================
-ynh_script_progression --message="Installing Composer..." --weight=31
+# ynh_script_progression --message="Installing Composer..." --weight=31
 
-mkdir -p "$install_dir/.composer"
+# mkdir -p "$install_dir/.composer"
 
-ynh_add_config --template="../conf/composer.json" --destination="$install_dir/.composer/composer.json"
+# ynh_add_config --template="../conf/composer.json" --destination="$install_dir/.composer/composer.json"
 
-ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.composer"
+# ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.composer"
 
-export PATH="$install_dir/.composer/vendor/bin:$PATH"
+# export PATH="$install_dir/.composer/vendor/bin:$PATH"
 
 #=================================================
 # INITIALIZE TMP AND PRIVATE DIRECTORY
 #=================================================
-ynh_script_progression --message="Initializing tmp and private directory..." --weight=1
+# ynh_script_progression --message="Initializing tmp and private directory..." --weight=1
 
-mkdir -p "$install_dir/app/sites/default/files"
-mkdir -p "$install_dir/app/sites/default/files/tmp"
+# mkdir -p "$install_dir/app/sites/default/files"
+# mkdir -p "$install_dir/app/sites/default/files/tmp"
 
-chmod 750 "$install_dir"
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-chmod 2775 "$install_dir/app/sites/default/files"
+# chmod 750 "$install_dir"
+# chmod -R o-rwx "$install_dir"
+# chown -R $app:www-data "$install_dir"
+# chmod 2775 "$install_dir/app/sites/default/files"
 
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/default.settings.php" --destination="$install_dir/app/sites/default/settings.php"
+ynh_add_config --template="../conf/default.settings.php" --destination="$install_dir/settings.php"
 
-chmod 600 "$install_dir/app/sites/default/settings.php"
-chown $app:$app "$install_dir/app/sites/default/settings.php"
+chmod 600 "$install_dir/settings.php"
+chown $app:$app "$install_dir/settings.php"
 
 #=================================================
 # INSTALLING FRAMAFORMS WITH DRUSH
 #=================================================
-ynh_script_progression --message="Installing database..." --weight=19
+# ynh_script_progression --message="Installing database..." --weight=19
 
-update-alternatives --set php /usr/bin/php$phpversion
-ynh_exec_as $app env PATH=$PATH drush @$app site-install framaforms_org  install_configure_form.site_contact_url="https://forum.yunohost.org/t/framaforms-create-polls-using-drag-and-drop/8208" install_configure_form.site_default_country=FR -y --locale="$language" --account-name="admin" --account-pass="$password" --site-name="Framaforms" --site-mail="$admin_mail" 2>&1
-ynh_exec_as $app env PATH=$PATH drush @$app variable-set update_notify_emails "$admin_mail"
-ynh_exec_as $app env PATH=$PATH drush @$app variable-set file_private_path "/home/yunohost.app/$app/data" 2>&1
-ynh_exec_as $app env PATH=$PATH drush @$app pm-enable framaforms_feature -y --resolve-dependencies 2>&1
-ynh_exec_as $app env PATH=$PATH drush @$app php-eval "module_load_include('inc', 'framaforms', 'includes/framaforms.pages');create_all_pages();" 2>&1 || true
+# update-alternatives --set php /usr/bin/php$phpversion
+# ynh_exec_as $app env PATH=$PATH drush @$app site-install framaforms_org  install_configure_form.site_contact_url="https://forum.yunohost.org/t/framaforms-create-polls-using-drag-and-drop/8208" install_configure_form.site_default_country=FR -y --locale="$language" --account-name="admin" --account-pass="$password" --site-name="Framaforms" --site-mail="$admin_mail" 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app variable-set update_notify_emails "$admin_mail"
+# ynh_exec_as $app env PATH=$PATH drush @$app variable-set file_private_path "/home/yunohost.app/$app/data" 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app pm-enable framaforms_feature -y --resolve-dependencies 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app php-eval "module_load_include('inc', 'framaforms', 'includes/framaforms.pages');create_all_pages();" 2>&1 || true
 
 #=================================================
 # IMPORTING LANGUAGE PACK
 #=================================================
-ynh_script_progression --message="Importing language pack..." --weight=5
+# ynh_script_progression --message="Importing language pack..." --weight=5
 
-ynh_exec_as $app env PATH=$PATH drush @$app pm-download -y drush_language 2>&1
-ynh_exec_as $app env PATH=$PATH drush @$app pm-download -y l10n_update 2>&1
-ynh_exec_as $app env PATH=$PATH drush @$app pm-enable -y l10n_update 2>&1
-ynh_exec_as $app env PATH=$PATH drush @$app language-add $language -y 2>&1
-ynh_exec_as $app env PATH=$PATH drush @$app language-default $language -y 2>&1
-ynh_exec_as $app env PATH=$PATH drush @$app cache-clear drush -y 2>&1
-ynh_exec_as $app env PATH=$PATH drush @$app l10n-update-refresh -y 2>&1
-ynh_exec_as $app env PATH=$PATH drush @$app l10n-update -y 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app pm-download -y drush_language 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app pm-download -y l10n_update 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app pm-enable -y l10n_update 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app language-add $language -y 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app language-default $language -y 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app cache-clear drush -y 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app l10n-update-refresh -y 2>&1
+# ynh_exec_as $app env PATH=$PATH drush @$app l10n-update -y 2>&1
 
 # We don't upgrade module to avoid to erase framaforms change 
 # in drupal core and modules code
@@ -127,35 +127,35 @@ ynh_exec_as $app env PATH=$PATH drush @$app l10n-update -y 2>&1
 #=================================================
 # REMOVING BRANDING AND CHANGING DEFAULT SETTINGS
 #=================================================
-ynh_script_progression --message="Removing branding and change default settings..." --weight=1
+# ynh_script_progression --message="Removing branding and change default settings..." --weight=1
 
-ynh_exec_as $app env PATH=$PATH drush @$app vset error_level 0
-ynh_exec_as $app env PATH=$PATH drush @$app vset framaforms_notification_period_value $expiration
-ynh_exec_as $app env PATH=$PATH drush @$app vset framaforms_deletion_period_value $deletion
-# Remove framaforms footer
-ynh_exec_as $app env PATH=$PATH drush @$app sql-query "UPDATE block SET region='-1', status=0 WHERE delta='framaforms_footer' AND region='footer'"
+# ynh_exec_as $app env PATH=$PATH drush @$app vset error_level 0
+# ynh_exec_as $app env PATH=$PATH drush @$app vset framaforms_notification_period_value $expiration
+# ynh_exec_as $app env PATH=$PATH drush @$app vset framaforms_deletion_period_value $deletion
+# # Remove framaforms footer
+# ynh_exec_as $app env PATH=$PATH drush @$app sql-query "UPDATE block SET region='-1', status=0 WHERE delta='framaforms_footer' AND region='footer'"
 
 #=================================================
 # CONFIGURING LDAP
 #=================================================
-ynh_script_progression --message="Configuring LDAP authentication..." --weight=1
+# ynh_script_progression --message="Configuring LDAP authentication..." --weight=1
 
-ynh_exec_as $app env PATH=$PATH drush @$app pm-download ldap
-ynh_exec_as $app env PATH=$PATH drush @$app pm-enable -y ldap_servers ldap_user ldap_authentication ldap_authorization ldap_authorization_drupal_role
-# Generated with sudo -u postgres pg_dump -a -t ldap_servers --inserts framaforms
-ynh_exec_as $app env PATH=$PATH drush @$app sql-query "INSERT INTO public.ldap_servers VALUES ('localhost', 1, 'localhost', 1, 'default', 'ldap://127.0.0.1', 389, 0, 0, 3, '', NULL, 'a:2:{i:0;s:27:\"ou=users,dc=yunohost,dc=org\";i:1;s:32:\"ou=permission,dc=yunohost,dc=org\";}', 'uid', 'uid', 'mail', '', '', '', 0, 'cn=%username,ou=users,dc=yunohost,dc=org', '', '', '', 0, 'permissionynh', 0, 1, 'permission', 'memberuid', 'dn', 0, '', '$app.main', '', 0, 1000, 0);"
-ynh_exec_as $app env PATH=$PATH drush @$app sql-query "INSERT INTO public.ldap_authorization VALUES (1, 'localhost', 'drupal_role', 'ldap_authorization_drupal_role', 1, 1, 0, 'a:2:{i:0;a:6:{s:12:\"user_entered\";s:24:\"utilisateur authentifié\";s:4:\"from\";s:51:\"cn=framaforms.main,ou=permission,dc=yunohost,dc=org\";s:10:\"normalized\";s:24:\"utilisateur authentifié\";s:10:\"simplified\";s:24:\"utilisateur authentifié\";s:5:\"valid\";b:0;s:13:\"error_message\";s:112:\"Role <em class=\"placeholder\">utilisateur authentifié</em>_name does not exist and role creation is not enabled.\";}i:1;a:6:{s:12:\"user_entered\";s:13:\"administrator\";s:4:\"from\";s:52:\"cn=framaforms.admin,ou=permission,dc=yunohost,dc=org\";s:10:\"normalized\";s:13:\"administrator\";s:10:\"simplified\";s:13:\"administrator\";s:5:\"valid\";b:0;s:13:\"error_message\";s:101:\"Role <em class=\"placeholder\">administrator</em>_name does not exist and role creation is not enabled.\";}}', 1, 0, 1, 1, 1, 1);"
+# ynh_exec_as $app env PATH=$PATH drush @$app pm-download ldap
+# ynh_exec_as $app env PATH=$PATH drush @$app pm-enable -y ldap_servers ldap_user ldap_authentication ldap_authorization ldap_authorization_drupal_role
+# # Generated with sudo -u postgres pg_dump -a -t ldap_servers --inserts framaforms
+# ynh_exec_as $app env PATH=$PATH drush @$app sql-query "INSERT INTO public.ldap_servers VALUES ('localhost', 1, 'localhost', 1, 'default', 'ldap://127.0.0.1', 389, 0, 0, 3, '', NULL, 'a:2:{i:0;s:27:\"ou=users,dc=yunohost,dc=org\";i:1;s:32:\"ou=permission,dc=yunohost,dc=org\";}', 'uid', 'uid', 'mail', '', '', '', 0, 'cn=%username,ou=users,dc=yunohost,dc=org', '', '', '', 0, 'permissionynh', 0, 1, 'permission', 'memberuid', 'dn', 0, '', '$app.main', '', 0, 1000, 0);"
+# ynh_exec_as $app env PATH=$PATH drush @$app sql-query "INSERT INTO public.ldap_authorization VALUES (1, 'localhost', 'drupal_role', 'ldap_authorization_drupal_role', 1, 1, 0, 'a:2:{i:0;a:6:{s:12:\"user_entered\";s:24:\"utilisateur authentifié\";s:4:\"from\";s:51:\"cn=framaforms.main,ou=permission,dc=yunohost,dc=org\";s:10:\"normalized\";s:24:\"utilisateur authentifié\";s:10:\"simplified\";s:24:\"utilisateur authentifié\";s:5:\"valid\";b:0;s:13:\"error_message\";s:112:\"Role <em class=\"placeholder\">utilisateur authentifié</em>_name does not exist and role creation is not enabled.\";}i:1;a:6:{s:12:\"user_entered\";s:13:\"administrator\";s:4:\"from\";s:52:\"cn=framaforms.admin,ou=permission,dc=yunohost,dc=org\";s:10:\"normalized\";s:13:\"administrator\";s:10:\"simplified\";s:13:\"administrator\";s:5:\"valid\";b:0;s:13:\"error_message\";s:101:\"Role <em class=\"placeholder\">administrator</em>_name does not exist and role creation is not enabled.\";}}', 1, 0, 1, 1, 1, 1);"
 
-cat ../conf/ldap.conf | ynh_exec_as $app env PATH=$PATH drush @$app variable-set --format=yaml ldap_authentication_conf -
+# cat ../conf/ldap.conf | ynh_exec_as $app env PATH=$PATH drush @$app variable-set --format=yaml ldap_authentication_conf -
 
-update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION}
+# update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION}
 
 #=================================================
 # SETUP THE CRON FILE
 #=================================================
-ynh_script_progression --message="Setuping the cron file..."
+# ynh_script_progression --message="Setuping the cron file..."
 
-ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+# ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/remove b/scripts/remove
index 2b53bd7..8838788 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -33,7 +33,7 @@ ynh_remove_fpm_config
 ynh_script_progression --message="Removing various files..."
 
 # Remove a cron file
-ynh_secure_remove --file="/etc/cron.d/$app"
+#ynh_secure_remove --file="/etc/cron.d/$app"
 
 #=================================================
 # END OF SCRIPT