From e8b4134e585a79409aaa8445fa0bc1c8e2c651ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:37:37 +0100 Subject: [PATCH 01/14] v2 --- conf/app.src | 7 ---- conf/nginx.conf | 2 +- manifest.toml | 67 +++++++++++++++++++++++++++++++++++++ scripts/_common.sh | 6 ++-- scripts/backup | 18 +++++----- scripts/change_url | 66 +++++++++++++++++++------------------ scripts/install | 82 +++++++++++++++++++++++----------------------- scripts/remove | 30 ++++++++--------- scripts/restore | 52 ++++++++++++++--------------- scripts/upgrade | 70 +++++++++++++++++++-------------------- 10 files changed, 231 insertions(+), 169 deletions(-) delete mode 100644 conf/app.src create mode 100644 manifest.toml diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 38de527..0000000 --- a/conf/app.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/processwire/processwire/archive/refs/tags/3.0.210.zip -SOURCE_SUM=7436bae42fafafb7eff1476956ab54eaed3e0689ba2ecae5e4363033394c93f6 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 2945eef..6f10e28 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/; + alias __INSTALL_DIR__/; index index.php; diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..e99ac3f --- /dev/null +++ b/manifest.toml @@ -0,0 +1,67 @@ +packaging_format = 2 + +id = "processwire" +name = "ProcessWire" +description.en = "Friendly and powerful open source CMS with a strong API" +description.fr = "CMS open source convivial et puissant avec une API puissante" + +version = "3.0.210~ynh1" + +maintainers = ["eric_G"] + +[upstream] +license = "MPL-2.0" +website = "https://processwire.com/" +userdoc = "https://processwire.com/docs/" +demo = "https://processwire.com/about/demo/" +code = "https://github.com/processwire/processwire" +cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) +fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. + +[integration] +yunohost = ">= 11.0.9" +architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +multi_instance = true +ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. +sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. +disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... +ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... + +[install] + [install.domain] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "domain" + + [install.path] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "path" + default = "/processwire" + + [install.init_main_permission] + type = "group" + default = "visitors" + + [install.admin] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "user" + + [install.password] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "password" + +[resources] + [resources.sources.main] + url = "https://github.com/processwire/processwire/archive/refs/tags/3.0.210.zip" + sha256 = "7436bae42fafafb7eff1476956ab54eaed3e0689ba2ecae5e4363033394c93f6" + + + [resources.system_user] + + [resources.install_dir] + + [resources.permissions] + main.url = "/" + + [resources.database] + type = "mysql" diff --git a/scripts/_common.sh b/scripts/_common.sh index f8921d5..415b59f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,12 +6,12 @@ # PHP APP SPECIFIC #================================================= -YNH_PHP_VERSION=8.0 +#REMOVEME? YNH_PHP_VERSION=8.0 -php_dependencies="php$YNH_PHP_VERSION-gd php$YNH_PHP_VERSION-mysql" +#REMOVEME? php_dependencies="php$YNH_PHP_VERSION-gd php$YNH_PHP_VERSION-mysql" # dependencies used by the app (must be on a single line) -pkg_dependencies="$php_dependencies" +#REMOVEME? pkg_dependencies="$php_dependencies" #================================================= # PERSONAL HELPERS diff --git a/scripts/backup b/scripts/backup index 4547eef..c5233fc 100755 --- a/scripts/backup +++ b/scripts/backup @@ -14,24 +14,24 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { +#REMOVEME? ynh_clean_setup () { ### Remove this function if there's nothing to clean before calling the remove script. true } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_print_info --message="Loading installation settings..." +#REMOVEME? ynh_print_info --message="Loading installation settings..." -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -42,7 +42,7 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$final_path" +ynh_backup --src_path="$install_dir" #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/change_url b/scripts/change_url index 94cd732..359bdcb 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -13,58 +13,58 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS #================================================= -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH +#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN +#REMOVEME? old_path=$YNH_APP_OLD_PATH -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH +#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN +#REMOVEME? new_path=$YNH_APP_NEW_PATH -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? # Needed for helper "ynh_add_nginx_config" +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) # Add settings here as needed by your application -#db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? #db_name=$(ynh_app_setting_get --app=$app --key=db_name) #db_user=$db_name -#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) +#REMOVEME? #db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 +#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup () { # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= -change_domain=0 -if [ "$old_domain" != "$new_domain" ] +#REMOVEME? change_domain=0 +#REMOVEME? if [ "$old_domain" != "$new_domain" ] then - change_domain=1 + #REMOVEME? change_domain=1 fi -change_path=0 -if [ "$old_path" != "$new_path" ] +#REMOVEME? change_path=0 +#REMOVEME? if [ "$old_path" != "$new_path" ] then - change_path=1 + #REMOVEME? change_path=1 fi #================================================= @@ -74,36 +74,38 @@ fi #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf +ynh_change_url_nginx_config + +#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf # Change the path in the NGINX config file if [ $change_path -eq 1 ] then # Make a backup of the original NGINX config file if modified - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" +#REMOVEME? ynh_backup_if_checksum_is_different --file="$nginx_conf_path" # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" +#REMOVEME? domain="$old_domain" +#REMOVEME? path="$new_path" # Create a dedicated NGINX config - ynh_add_nginx_config +#REMOVEME? ynh_add_nginx_config fi # Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf +#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" +#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 46d1cef..1f5a25c 100755 --- a/scripts/install +++ b/scripts/install @@ -13,24 +13,24 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { +#REMOVEME? ynh_clean_setup () { ### Remove this function if there's nothing to clean before calling the remove script. true } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH -is_public=$YNH_APP_ARG_IS_PUBLIC -admin=$YNH_APP_ARG_ADMIN -password=$YNH_APP_ARG_PASSWORD +#REMOVEME? domain=$YNH_APP_ARG_DOMAIN +#REMOVEME? path=$YNH_APP_ARG_PATH +#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC +#REMOVEME? admin=$YNH_APP_ARG_ADMIN +#REMOVEME? password=$YNH_APP_ARG_PASSWORD -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME fpm_footprint="low" fpm_free_footprint=0 @@ -39,22 +39,22 @@ fpm_usage="low" #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." --weight=1 +#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1 -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" +#REMOVEME? install_dir=/var/www/$app +#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 -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=admin --value=$admin +#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain +#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path +#REMOVEME? ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage @@ -64,49 +64,49 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Finding an available port..." --weight=1 +#REMOVEME? ynh_script_progression --message="Finding an available port..." --weight=1 # Find an available port -port=$(ynh_find_port --port=8095) -ynh_app_setting_set --app=$app --key=port --value=$port +#REMOVEME? port=$(ynh_find_port --port=8095) +#REMOVEME? ynh_app_setting_set --app=$app --key=port --value=$port #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=9 +#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=9 -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Configuring system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=1 # Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # CREATE A MYSQL DATABASE #================================================= -ynh_script_progression --message="Creating a MySQL database..." --weight=1 +#REMOVEME? ynh_script_progression --message="Creating a MySQL database..." --weight=1 -db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name -ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name +#REMOVEME? db_name=$(ynh_sanitize_dbid --db_name=$app) +#REMOVEME? db_user=$db_name +#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name +#REMOVEME? ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=3 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path +#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" +ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # PHP-FPM CONFIGURATION @@ -115,7 +115,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION @@ -128,24 +128,24 @@ ynh_add_nginx_config #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 +#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary -if [ $is_public -eq 1 ] +#REMOVEME? if [ $is_public -eq 1 ] then # Everyone can access the app. # The "main" permission is automatically created before the install script. - ynh_permission_update --permission="main" --add="visitors" +#REMOVEME? ynh_permission_update --permission="main" --add="visitors" fi -ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin +#REMOVEME? ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # SEND A README FOR THE ADMIN @@ -154,7 +154,7 @@ ynh_script_progression --message="Sending a readme for the admin..." --weight=1 message="Processwire was successfully installed -Please open your $app domain: https://$domain$path_url +Please open your $app domain: https://$domain$path Complete the registration process from the setup page displayed. Details for MySQL database to be enterted while registration process: diff --git a/scripts/remove b/scripts/remove index 78411dc..e77191a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,31 +12,31 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -port=$(ynh_app_setting_get --app=$app --key=port) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? port=$(ynh_app_setting_get --app=$app --key=port) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) #================================================= # REMOVE THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Removing the MySQL database..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing the MySQL database..." --weight=1 # Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name +#REMOVEME? ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely -ynh_secure_remove --file="$final_path" +#REMOVEME? ynh_secure_remove --file="$install_dir" #================================================= # REMOVE NGINX CONFIGURATION @@ -57,20 +57,20 @@ ynh_remove_fpm_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --weight=4 +#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=4 # Remove metapackage and its dependencies -ynh_remove_app_dependencies +#REMOVEME? ynh_remove_app_dependencies #================================================= # GENERIC FINALIZATION #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user -ynh_system_user_delete --username=$app +#REMOVEME? ynh_system_user_delete --username=$app #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 8bdcad5..a133e2a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -14,68 +14,68 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { +#REMOVEME? ynh_clean_setup () { #### Remove this function if there's nothing to clean before calling the remove script. true } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) -fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) +#REMOVEME? fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) +#REMOVEME? fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=1 +#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +#REMOVEME? test ! -d $install_dir \ + || ynh_die --message="There is already a directory: $install_dir " #================================================= # STANDARD RESTORATION STEPS #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression --message="Restoring the app main directory..." --weight=1 -ynh_restore_file --origin_path="$final_path" +ynh_restore_file --origin_path="$install_dir" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # SPECIFIC RESTORATION #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -97,10 +97,10 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=1 +#REMOVEME? ynh_script_progression --message="Restoring the MySQL database..." --weight=1 -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +#REMOVEME? ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index a8ffe4b..b3acf84 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,19 +12,19 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) -fpm_free_footprint=$(ynh_app_setting_get --app=$app --key=fpm_free_footprint) -fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) +#REMOVEME? fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) +#REMOVEME? fpm_free_footprint=$(ynh_app_setting_get --app=$app --key=fpm_free_footprint) +#REMOVEME? fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= # CHECK VERSION @@ -35,16 +35,16 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 +#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup () { # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS @@ -72,29 +72,29 @@ if [ -z "$fpm_usage" ]; then fi # Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all +#REMOVEME? if ynh_legacy_permissions_exists; then +#REMOVEME? ynh_legacy_permissions_delete_all ynh_app_setting_delete --app=$app --key=is_public fi -if ! ynh_permission_exists --permission="admin"; then +#REMOVEME? if ! ynh_permission_exists --permission="admin"; then # Create the required permissions - ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin +#REMOVEME? ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin fi # Create a permission if needed -if ! ynh_permission_exists --permission="api"; then - ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" +#REMOVEME? if ! ynh_permission_exists --permission="api"; then +#REMOVEME? ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" fi #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 +#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -105,19 +105,19 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$install_dir" fi -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=1 -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # PHP-FPM CONFIGURATION @@ -126,7 +126,7 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION @@ -141,17 +141,17 @@ ynh_add_nginx_config #================================================= # ynh_script_progression --message="Updating a configuration file..." --weight=1 -# ynh_add_config --template="some_config_file" --destination="$final_path/some_config_file" +# ynh_add_config --template="some_config_file" --destination="$install_dir/some_config_file" -# chmod 400 "$final_path/some_config_file" -# chown $app:$app "$final_path/some_config_file" +# chmod 400 "$install_dir/some_config_file" +# chown $app:$app "$install_dir/some_config_file" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT From 0c2908caa569042649dbd6dc18939cc278ee8032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:45:01 +0100 Subject: [PATCH 02/14] v2 --- doc/DESCRIPTION_fr.md | 1 + doc/DISCLAIMER.md | 0 doc/POSTINSTALL.md | 6 +++ manifest.json | 59 ------------------------ manifest.toml | 28 ++++++------ scripts/_common.sh | 64 -------------------------- scripts/change_url | 89 ------------------------------------ scripts/install | 103 +----------------------------------------- scripts/remove | 54 ---------------------- scripts/restore | 73 ++---------------------------- scripts/upgrade | 90 +----------------------------------- 11 files changed, 27 insertions(+), 540 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md delete mode 100644 doc/DISCLAIMER.md create mode 100644 doc/POSTINSTALL.md delete mode 100644 manifest.json diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..89846c4 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +ProcessWire est un CMS open source convivial et puissant avec une API qui est un plaisir à utiliser à n'importe quelle échelle. Il s'agit à la fois d'un système de gestion de contenu (CMS) et d'un framework (CMF) conçus pour vous faire gagner du temps et travailler comme vous le faites. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md deleted file mode 100644 index e69de29..0000000 diff --git a/doc/POSTINSTALL.md b/doc/POSTINSTALL.md new file mode 100644 index 0000000..72068d2 --- /dev/null +++ b/doc/POSTINSTALL.md @@ -0,0 +1,6 @@ +Complete the registration process from the setup page displayed. +Details for MySQL database to be enterted while registration process: + +Database login: __DB_USER__ +Database name: __DB_NAME__ +Database password: __DB_PWD__ diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 349c843..0000000 --- a/manifest.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "name": "ProcessWire", - "id": "processwire", - "packaging_format": 1, - "description": { - "en": "Friendly and powerful open source CMS with a strong API", - "fr": "CMS open source convivial et puissant avec une API puissante" - }, - "version": "3.0.210~ynh1", - "url": "https://processwire.com/", - "upstream": { - "license": "MPL-2.0", - "website": "https://processwire.com/", - "userdoc": "https://processwire.com/docs/", - "demo": "https://processwire.com/about/demo/", - "code": "https://github.com/processwire/processwire" - }, - "license": "MPL-2.0", - "maintainer": { - "name": "eric_G", - "email": "" - }, - "requirements": { - "yunohost": ">= 11.0.9" - }, - "multi_instance": true, - "services": [ - "nginx", - "php8.0-fpm", - "mysql" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/processwire", - "default": "/processwire" - }, - { - "name": "is_public", - "type": "boolean", - "default": true - }, - { - "name": "admin", - "type": "user" - }, - { - "name": "password", - "type": "password" - } - ] - } -} diff --git a/manifest.toml b/manifest.toml index e99ac3f..bb2f587 100644 --- a/manifest.toml +++ b/manifest.toml @@ -15,26 +15,25 @@ website = "https://processwire.com/" userdoc = "https://processwire.com/docs/" demo = "https://processwire.com/about/demo/" code = "https://github.com/processwire/processwire" -cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) -fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. [integration] -yunohost = ">= 11.0.9" -architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +yunohost = ">= 11.2" +architectures = "all" multi_instance = true -ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. -sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. -disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... -ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... -ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... + +ldap = false + +sso = false + +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" [install] [install.domain] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "domain" [install.path] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "path" default = "/processwire" @@ -43,11 +42,9 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen default = "visitors" [install.admin] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "user" [install.password] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "password" [resources] @@ -60,8 +57,13 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources.install_dir] + [resources.ports] + [resources.permissions] main.url = "/" + [resources.apt] + packages = "mariadb-server, php8.2-gd, php8.2-mysql" + [resources.database] type = "mysql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 415b59f..1e47ce7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,13 +6,6 @@ # PHP APP SPECIFIC #================================================= -#REMOVEME? YNH_PHP_VERSION=8.0 - -#REMOVEME? php_dependencies="php$YNH_PHP_VERSION-gd php$YNH_PHP_VERSION-mysql" - -# dependencies used by the app (must be on a single line) -#REMOVEME? pkg_dependencies="$php_dependencies" - #================================================= # PERSONAL HELPERS #================================================= @@ -21,63 +14,6 @@ # EXPERIMENTAL HELPERS #================================================= -# Send an email to inform the administrator -# -# usage: ynh_send_readme_to_admin app_message [recipients] -# | arg: app_message - The message to send to the administrator. -# | arg: recipients - The recipients of this email. Use spaces to separate multiples recipients. - default: root -# example: "root admin@domain" -# If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you -# example: "root admin@domain user1 user2" -ynh_send_readme_to_admin() { - local app_message="${1:-...No specific information...}" - local recipients="${2:-root}" - - # Retrieve the email of users - find_mails () { - local list_mails="$1" - local mail - local recipients=" " - # Read each mail in argument - for mail in $list_mails - do - # Keep root or a real email address as it is - if [ "$mail" = "root" ] || echo "$mail" | grep --quiet "@" - then - recipients="$recipients $mail" - else - # But replace an user name without a domain after by its email - if mail=$(ynh_user_get_info "$mail" "mail" 2> /dev/null) - then - recipients="$recipients $mail" - fi - fi - done - echo "$recipients" - } - recipients=$(find_mails "$recipients") - - local mail_subject="☁️🆈🅽🅷☁️: \`$app\` has important message for you" - - local mail_message="This is an automated message from your beloved YunoHost server. -Specific information for the application $app. -$app_message ---- -Automatic diagnosis data from YunoHost -$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" - - # Define binary to use for mail command - if [ -e /usr/bin/bsd-mailx ] - then - local mail_bin=/usr/bin/bsd-mailx - else - local mail_bin=/usr/bin/mail.mailutils - fi - - # Send the email to the recipients - echo "$mail_message" | $mail_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients" -} - #================================================= # FUTURE OFFICIAL HELPERS #================================================= diff --git a/scripts/change_url b/scripts/change_url index 359bdcb..a4fcb69 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,64 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN -#REMOVEME? old_path=$YNH_APP_OLD_PATH - -#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN -#REMOVEME? new_path=$YNH_APP_NEW_PATH - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? # Needed for helper "ynh_add_nginx_config" -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) - -# Add settings here as needed by your application -#REMOVEME? #db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#db_user=$db_name -#REMOVEME? #db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 - -# Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. -#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -#REMOVEME? change_domain=0 -#REMOVEME? if [ "$old_domain" != "$new_domain" ] -then - #REMOVEME? change_domain=1 -fi - -#REMOVEME? change_path=0 -#REMOVEME? if [ "$old_path" != "$new_path" ] -then - #REMOVEME? change_path=1 -fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -76,37 +18,6 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config -#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - -# Change the path in the NGINX config file -if [ $change_path -eq 1 ] -then - # Make a backup of the original NGINX config file if modified -#REMOVEME? ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for NGINX helper -#REMOVEME? domain="$old_domain" -#REMOVEME? path="$new_path" - # Create a dedicated NGINX config -#REMOVEME? ynh_add_nginx_config -fi - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location -#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" -#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location -#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi - -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index 1f5a25c..6a6819c 100755 --- a/scripts/install +++ b/scripts/install @@ -9,102 +9,30 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -#REMOVEME? ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -#REMOVEME? domain=$YNH_APP_ARG_DOMAIN -#REMOVEME? path=$YNH_APP_ARG_PATH -#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC -#REMOVEME? admin=$YNH_APP_ARG_ADMIN -#REMOVEME? password=$YNH_APP_ARG_PASSWORD - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= -#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1 - -#REMOVEME? install_dir=/var/www/$app -#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" - -# Register (book) web path -#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path - #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 +ynh_script_progression --message="Storing installation settings..." --weight=1 -#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain -#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path -#REMOVEME? ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -#================================================= -# STANDARD MODIFICATIONS -#================================================= -# FIND AND OPEN A PORT -#================================================= -#REMOVEME? ynh_script_progression --message="Finding an available port..." --weight=1 - -# Find an available port -#REMOVEME? port=$(ynh_find_port --port=8095) -#REMOVEME? ynh_app_setting_set --app=$app --key=port --value=$port - -#================================================= -# INSTALL DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=9 - -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies - -#================================================= -# CREATE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=1 - -# Create a system user -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - -#================================================= -# CREATE A MYSQL DATABASE -#================================================= -#REMOVEME? ynh_script_progression --message="Creating a MySQL database..." --weight=1 - -#REMOVEME? db_name=$(ynh_sanitize_dbid --db_name=$app) -#REMOVEME? db_user=$db_name -#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name -#REMOVEME? ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=3 -#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -115,38 +43,9 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 - -# Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# SETUP SSOWAT -#================================================= -#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=1 - -# Make app public if necessary -#REMOVEME? if [ $is_public -eq 1 ] -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. -#REMOVEME? ynh_permission_update --permission="main" --add="visitors" -fi - -#REMOVEME? ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin - -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # SEND A README FOR THE ADMIN #================================================= diff --git a/scripts/remove b/scripts/remove index e77191a..ac762c0 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,69 +9,15 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? port=$(ynh_app_setting_get --app=$app --key=port) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) - -#================================================= -# REMOVE THE MYSQL DATABASE -#================================================= -#REMOVEME? ynh_script_progression --message="Removing the MySQL database..." --weight=1 - -# Remove a database if it exists, along with the associated user -#REMOVEME? ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name - -#================================================= -# REMOVE APP MAIN DIR -#================================================= -#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=1 - -# Remove the app directory securely -#REMOVEME? ynh_secure_remove --file="$install_dir" - #================================================= # REMOVE NGINX CONFIGURATION #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 -# Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2 - -# Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=4 - -# Remove metapackage and its dependencies -#REMOVEME? ynh_remove_app_dependencies - -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=1 - -# Delete a system user -#REMOVEME? ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index a133e2a..57ddbd6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,52 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -#REMOVEME? ynh_clean_setup () { - #### Remove this function if there's nothing to clean before calling the remove script. - true -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - -#REMOVEME? fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) -#REMOVEME? fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1 - -#REMOVEME? test ! -d $install_dir \ - || ynh_die --message="There is already a directory: $install_dir " - -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 - -# Create the dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -63,19 +17,15 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# SPECIFIC RESTORATION +# RESTORE THE MYSQL DATABASE #================================================= -# REINSTALL DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=1 +ynh_script_progression --message="Restoring the MySQL database..." --weight=1 -# Define and install dependencies -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -84,25 +34,8 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -# Recreate a dedicated php-fpm config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion - -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -#REMOVEME? ynh_script_progression --message="Restoring the MySQL database..." --weight=1 - -#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -#REMOVEME? ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b3acf84..d49c15a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,43 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - -#REMOVEME? fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) -#REMOVEME? fpm_free_footprint=$(ynh_app_setting_get --app=$app --key=fpm_free_footprint) -#REMOVEME? fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) - #================================================= # CHECK VERSION #================================================= upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 - -# Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { - # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -71,31 +40,6 @@ if [ -z "$fpm_usage" ]; then ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi -# Cleaning legacy permissions -#REMOVEME? if ynh_legacy_permissions_exists; then -#REMOVEME? ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - -#REMOVEME? if ! ynh_permission_exists --permission="admin"; then - # Create the required permissions -#REMOVEME? ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin -fi - -# Create a permission if needed -#REMOVEME? if ! ynh_permission_exists --permission="api"; then -#REMOVEME? ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" -fi - -#================================================= -# CREATE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 - -# Create a dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -104,55 +48,23 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 - # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" fi -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=1 - -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies - #================================================= # PHP-FPM CONFIGURATION #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPDATE A CONFIG FILE -#================================================= -# ynh_script_progression --message="Updating a configuration file..." --weight=1 - -# ynh_add_config --template="some_config_file" --destination="$install_dir/some_config_file" - -# chmod 400 "$install_dir/some_config_file" -# chown $app:$app "$install_dir/some_config_file" - -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= From c6e326e46a412a195d27c1cd8175fe2c0af1241c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 20 Dec 2023 07:45:05 +0000 Subject: [PATCH 03/14] Auto-update README --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index fa2c595..e5ade8f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -ProcessWire is a friendly and powerful open source CMS with an API that is a joy to use at any scale. It is both a content management system (CMS) and framework (CMF) built to save you time and work the way you do. +ProcessWire est un CMS open source convivial et puissant avec une API qui est un plaisir à utiliser à n'importe quelle échelle. Il s'agit à la fois d'un système de gestion de contenu (CMS) et d'un framework (CMF) conçus pour vous faire gagner du temps et travailler comme vous le faites. **Version incluse :** 3.0.210~ynh1 From b1d93271f04c1fbae24eae3e836bd9d219801c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:45:53 +0100 Subject: [PATCH 04/14] v2 --- scripts/backup | 23 ----------------------- scripts/upgrade | 6 +++--- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/scripts/backup b/scripts/backup index c5233fc..214b288 100755 --- a/scripts/backup +++ b/scripts/backup @@ -10,29 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -#REMOVEME? ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_print_info --message="Loading installation settings..." - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d49c15a..181ce07 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,19 +23,19 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If fpm_footprint doesn't exist, create it -if [ -z "$fpm_footprint" ]; then +if [ -z "${fpm_footprint:-}" ]; then fpm_footprint=low ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint fi # If fpm_free_footprint doesn't exist, create it -if [ -z "$fpm_free_footprint" ]; then +if [ -z "${fpm_free_footprint:-}" ]; then fpm_free_footprint=0 ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint fi # If fpm_usage doesn't exist, create it -if [ -z "$fpm_usage" ]; then +if [ -z "${fpm_usage:-}" ]; then fpm_usage=low ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi From ec29b4b4f43a1ce250e4533c102949532a9d7e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:46:25 +0100 Subject: [PATCH 05/14] Create tests.toml --- tests.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tests.toml diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..cbbeef1 --- /dev/null +++ b/tests.toml @@ -0,0 +1,3 @@ +test_format = 1.0 + +[default] From aeb43c4ed5899d8a42a7b5140a6dc3cdcf1d0b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:48:45 +0100 Subject: [PATCH 06/14] Delete check_process --- check_process | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 check_process diff --git a/check_process b/check_process deleted file mode 100644 index 0a56d22..0000000 --- a/check_process +++ /dev/null @@ -1,29 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - language="fr" - admin="john" - password="1Strong-Password" - port="666" - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - #upgrade=1 from_commit=CommitHash - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666& From d68a4e707b8ea4bc45de5984a06035fb76bb7cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:50:35 +0100 Subject: [PATCH 07/14] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index bb2f587..bec6a04 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ProcessWire" description.en = "Friendly and powerful open source CMS with a strong API" description.fr = "CMS open source convivial et puissant avec une API puissante" -version = "3.0.210~ynh1" +version = "3.0.227~ynh1" maintainers = ["eric_G"] @@ -49,9 +49,9 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/processwire/processwire/archive/refs/tags/3.0.210.zip" - sha256 = "7436bae42fafafb7eff1476956ab54eaed3e0689ba2ecae5e4363033394c93f6" - + url = "https://github.com/processwire/processwire/archive/refs/tags/3.0.227.zip" + sha256 = "2f00118af881319f8bc6e1a746f76d9b5d55b3ec656b5c4988493d11f8937de7" + autoupdate.strategy = "latest_github_tag" [resources.system_user] From 8cc4551cb28dbfdaa5ea8054a38cddc6b0205041 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 20 Dec 2023 07:50:40 +0000 Subject: [PATCH 08/14] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 058204a..6ac1569 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ProcessWire is a friendly and powerful open source CMS with an API that is a joy to use at any scale. It is both a content management system (CMS) and framework (CMF) built to save you time and work the way you do. -**Shipped version:** 3.0.210~ynh1 +**Shipped version:** 3.0.227~ynh1 **Demo:** https://processwire.com/about/demo/ diff --git a/README_fr.md b/README_fr.md index e5ade8f..c713ad5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ProcessWire est un CMS open source convivial et puissant avec une API qui est un plaisir à utiliser à n'importe quelle échelle. Il s'agit à la fois d'un système de gestion de contenu (CMS) et d'un framework (CMF) conçus pour vous faire gagner du temps et travailler comme vous le faites. -**Version incluse :** 3.0.210~ynh1 +**Version incluse :** 3.0.227~ynh1 **Démo :** https://processwire.com/about/demo/ From 9a5a569cd03a5b69ec539c0d618de3aea84f9141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:51:23 +0100 Subject: [PATCH 09/14] fix --- doc/{POSTINSTALL.md => POST_INSTALL.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{POSTINSTALL.md => POST_INSTALL.md} (100%) diff --git a/doc/POSTINSTALL.md b/doc/POST_INSTALL.md similarity index 100% rename from doc/POSTINSTALL.md rename to doc/POST_INSTALL.md From 7671589a30a7aa8655b47aab574ebf6acebafe29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:51:40 +0100 Subject: [PATCH 10/14] Update install --- scripts/install | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/scripts/install b/scripts/install index 6a6819c..508f669 100755 --- a/scripts/install +++ b/scripts/install @@ -46,26 +46,6 @@ ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint ynh_add_nginx_config -#================================================= -# SEND A README FOR THE ADMIN -#================================================= -ynh_script_progression --message="Sending a readme for the admin..." --weight=1 - -message="Processwire was successfully installed - -Please open your $app domain: https://$domain$path - -Complete the registration process from the setup page displayed. -Details for MySQL database to be enterted while registration process: - -Database login: $db_user -Database name: $db_name -Database password: $db_pwd - -If you are facing any problem or want to improve this app, please open a new issue here: https://github.com/YunoHost-Apps/processwire_ynh/issues" - -ynh_send_readme_to_admin "$message" - #================================================= # END OF SCRIPT #================================================= From 4661d9a98b55cbbfa7b37a1447d560a0d098d9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:57:26 +0100 Subject: [PATCH 11/14] Update nginx.conf --- conf/nginx.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6f10e28..a792973 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -49,7 +49,6 @@ location __PATH__/ { deny all; } - # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } From 474e3027bf48366a2d1c3647d845258c2aa4beb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:16:13 +0100 Subject: [PATCH 12/14] Create config.php --- conf/config.php | 2016 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2016 insertions(+) create mode 100644 conf/config.php diff --git a/conf/config.php b/conf/config.php new file mode 100644 index 0000000..035dba4 --- /dev/null +++ b/conf/config.php @@ -0,0 +1,2016 @@ +debug = false; + +/** + * Enable debug mode if condition is met + * + * ~~~~~ + * $config->debug = false; // setting this to false required when using debugIf + * $config->debugIf = '123.123.123.123'; // true if user matches this IP address + * $config->debugIf = [ '123.123.123.123', '456.456.456.456' ]; // array of IPs (3.0.212)+ + * $config->debugIf = 'function_name_to_call'; // callable function name + * $config->debugIf = function() { // callable function (3.0.212+) + * return $_SERVER['SERVER_PORT'] === '8888'; + * }; + * ~~~~~ + * + * Set debug mode to be false above, and then specify any one of the following here: + * - IP address of user required to enable debug mode; + * - Array of IP addresses where that debug mode should be enabled for (3.0.212+). + * - Your own callable function in /site/config.php that returns true or false for debug mode. + * - PCRE regular expression to match IP address of user (must start and end with a "/" + * slash). If IP address matches, then debug mode is enabled. Regular expression + * example: `/^123\.456\.789\./` would match all IP addresses that started with 123.456.789. + * + * #notes When used, this will override a false $config->debug, changing it at runtime automatically. + * @var string + * + */ +$config->debugIf = ''; + +/** + * Tools, and their order, to show in debug mode (admin) + * + * Options include: pages, api, session, modules, hooks, database, db, timers, user, input, cache, autoload, lazyload + * + * Note: when used, lazyload option should be placed first beause its results can be affected by later debug tools. + * + * @var array + * + */ +$config->debugTools = array( + //'lazyload', + 'pages', + 'api', + 'session', + 'modules', + 'hooks', + 'database', // PDO + 'db', // mysqli + 'timers', + 'user', + 'input', + 'cache', + 'autoload', +); + +/** + * Enable ProcessWire advanced development mode? + * + * Turns on additional options in ProcessWire Admin that aren't applicable in all instances. + * Be careful with this as some options configured in advanced mode (like system statuses) + * cannot be removed once set (at least not without going directly into the database). Below + * is a summary of what enabling advanced mode adds/changes: + * + * Fields (Setup > Fields): + * + * - Enables "system" and "permanent" flags as checkboxes on the Advanced tab when editing a field. + * - Makes the admin Setup > Fields dropdown show all fields, including system fields. + * - Enables creation of new fields using types only allowed in advanced mode. + * - Enables cloning of system fields. + * - Enables showing of System templates when selecting templates to add field to (Actions tab). + * + * Templates (Setup > Templates): + * + * - Makes the admin Setup > Templates dropdown show all templates, including system templates. + * - On the Basics tab, enables you to select a Fieldgroup independent of the Template. + * - Enables you to add "Permanent" flagged fields to a template. + * - When editing a template, makes it show a "System" tab with ability to assign system flag, + * predefined page class name, cancel of global status, setting to make the "name" field appear + * in the Content tab of the page editor, option to make page deletions bypass the trash, and + * option to disable the Settings tab in the page editor. + * - Enables you to copy fields from another Fieldgroup maintained by a system template. + * - Makes the "Advanced" tab show API examples with the Inputfield notes. + * + * Page Editor: + * + * - Enables showing of "Object type" Page class name on Settings tab Info fields. + * - Enables you to select System or SystemID status for a Page on the Settings tab Status field. + * - Enables some template changes for superuser that go beyond configured Family settings. + * + * Other: + * + * - In Modules, enables disable of autoload state for existing autoload module, for debug purposes. + * - In Lister, paired with debug mode, shows a fully parsed selector under the Lister table. + * - Shows an "Advanced mode" label in the footer of the admin theme. + * + * #notes Recommended mode is false, except occasionally during ProcessWire core or module development. + * @var bool + * + */ +$config->advanced = false; + +/** + * Enable demo mode? + * + * If true, disables save functions in Process modules (admin). + * + * @var bool + * + */ +$config->demo = false; + +/** + * Enable core API variables to be accessed as function calls? + * + * Benefits are better type hinting, always in scope, and potentially shorter API calls. + * See the file /wire/core/FunctionsAPI.php for details on these functions. + * + * @var bool + * + */ +$config->useFunctionsAPI = false; + +/** + * Enable use of front-end markup regions? + * + * When enabled, HTML elements with an "id" attribute that are output before the opening + * `` or `` tag can replace elements in the document that have the same id. + * Also supports append, prepend, replace, remove, before and after options. + * + * @var bool + * + */ +$config->useMarkupRegions = false; + +/** + * Use custom page classes? Specify boolean true to enable. + * + * When enabled, if a class with name "[TemplateName]Page" (in ProcessWire namespace) exists + * in /site/classes/[TemplateName]Page.php, and it extends ProcessWire’s Page class, then the + * Page will be created with that class rather than the default Page class. For instance, + * template “home” would look for a class named “HomePage” and template "blog-post" (or + * "blog_post") would look for a class named “BlogPostPage” (file: BlogPostPage.php). + * + * If you create a file named /site/classes/DefaultPage.php with a DefaultPage class within + * it (that extends Page), then it will be used for all pages that would otherwise use the + * `Page` class. + * + * @var bool|string + * @since 3.0.152 + * + */ +$config->usePageClasses = false; + +/** + * Use lazy loading of fields (plus templates and fieldgroups) for faster boot times? + * + * This delays loading of fields, templates and fieldgroups until they are requested. + * This can improve performance on systems with hundreds of fields or templates, as + * individual fields, templates/fieldgroups won't get constructed until they are needed. + * + * Specify `true` to use lazy loading for all types, `false` to disable all lazy loading, + * or specify array with one or more of the following for lazy loading only certain types: + * `[ 'fields', 'templates', 'fieldgroups' ]` + * + * @var bool|array + * @since 3.0.194 + * + */ +$config->useLazyLoading = true; + +/** + * Default value for $useVersion argument of $config->versionUrls() method + * + * Controls the cache busting behavior of the `$config->versionUrls()` method as used by + * ProcessWire’s admin themes (but may be used independently as well). When no + * `$useVersion` argument is specified to the versionUrls() method, it will use the + * default value specified here. If not specified, null is the default. + * + * - `true` (bool): Get version from filemtime. + * - `false` (bool): Never get file version, just use `$config->version`. + * - `foobar` (string): Specify any string to be the version to use on all URLs needing it. + * - `?foo=bar` (string): Optionally specify your own query string variable=value. + * - `null` (null): Auto-detect: use file version in debug mode or dev branch only, + * otherwise use `$config->version`. + * + * ~~~~~ + * // choose one to start with, copy and place in /site/config.php to enable + * $config->useVersionUrls = null; // default setting + * $config->useVersionUrls = true; // always use filemtime based version URLs + * $config->useVersionUrls = false; // only use core version in URLs + * $config->versionUrls = 'hello-world'; // always use this string as the version + * $config->versionUrls = '?version=123'; // optionally specify query string var and value + * ~~~~~ + * + * @var null|bool|string + * @since 3.0.227 + * + * $config->useVersionUrls = null; + */ + +/** + * Disable all HTTPS requirements? + * + * Use this option only for development or staging environments, on sites where you are + * otherwise requiring HTTPS. By setting this option to something other than false, you + * can disable any HTTPS requirements specified per-template, enabling you to use your + * site without SSL during development or staging, etc. + * + * The following options are available: + * - boolean true: Disable HTTPS requirements globally + * - string containing hostname: Disable HTTPS requirements only for specified hostname. + * - array containing hostnames: Disable HTTPS requirements for specified hostnames. + * + * @var bool|string|array + * + */ +$config->noHTTPS = false; + + + +/*** 2. DATES & TIMES *************************************************************************/ + +/** + * Default time zone + * + * Must be a [PHP timezone string](http://php.net/manual/en/timezones.php) + * + * #input timezone + * @var string + * + */ +$config->timezone = 'America/New_York'; + +/** + * System date format + * + * Default system date format. Preferably in a format that is string sortable. + * + * #notes This should be a [PHP date string](http://www.php.net/manual/en/function.date.php). + * + * @var string + * + */ +$config->dateFormat = 'Y-m-d H:i:s'; + + + + +/*** 3. SESSION *********************************************************************************/ + +/** + * Session name + * + * Default session name as used in session cookie. You may wish to change this if running + * multiple ProcessWire installations on the same server. By giving each installation a unique + * session name, you can stay logged into multiple installations at once. + * + * #notes Note that changing this will automatically logout any current sessions. + * @var string + * + */ +$config->sessionName = 'wire'; + +/** + * Session name when on HTTPS + * + * Same as session name but when on HTTPS. This is only used when the sessionCookieSecure + * option is enabled (default). When blank (default), it will be sessionName + 's'. + * + * @var string + * + */ +$config->sessionNameSecure = ''; + +/** + * Session expiration seconds + * + * How many seconds of inactivity before session expires + * + * @var int + * + */ +$config->sessionExpireSeconds = 86400; + +/** + * Are sessions allowed? + * + * Use this to determine at runtime whether or not a session is allowed for the current request. + * Otherwise, this should always be boolean TRUE. When using this option, we recommend + * providing a callable function like below. Make sure that you put in some logic to enable + * sessions on admin pages at minimum. The callable function receives a single $session argument + * which is the ProcessWire Session instance. + * + * Note that the API is not fully ready when this function is called, so the current $page and + * the current $user are not yet known, nor is the $input API variable available. + * + * Also note that if anything in the request calls upon $session->CSRF, then a session is + * automatically enabled. + * + * ~~~~~ + * $config->sessionAllow = function($session) use($config) { + * + * // if there is a session cookie, a session is likely already in use so keep it going + * if($session->hasCookie()) return true; + * + * // if URL is an admin URL, allow session (replace /processwire/ with your admin URL) + * if(strpos($config->requestPath(), '/processwire/') === 0) return true; + * + * // otherwise disallow session + * return false; + * }; + * ~~~~~ + * + * @var bool|callable Should be boolean, or callable that returns boolean. + * + */ +$config->sessionAllow = true; + + +/** + * Use session challenge? + * + * Should login sessions have a challenge key? (for extra security, recommended) + * + * @var bool + * + */ +$config->sessionChallenge = true; + +/** + * Use session fingerprint? + * + * Should login sessions also be tied to a fingerprint of the browser? + * Fingerprinting can be based upon browser-specific headers and/or + * IP addresses. But note that IP fingerprinting will be problematic on + * dynamic IPs. + * + * Predefined settings: + * + * - 0 or false: Fingerprint off + * - 1 or true: Fingerprint on with default setting (remote IP & useragent) + * + * Custom settings: + * + * - 2: Remote IP + * - 4: Forwarded/client IP (can be spoofed) + * - 8: Useragent + * - 16: Accept header + * + * To use the custom settings above, select one or more of those you want + * to fingerprint, note the numbers, and use them like in the examples: + * ~~~~~~ + * // to fingerprint just remote IP + * $config->sessionFingerprint = 2; + * + * // to fingerprint remote IP and useragent: + * $config->sessionFingerprint = 2 | 8; + * + * // to fingerprint remote IP, useragent and accept header: + * $config->sessionFingerprint = 2 | 8 | 16; + * ~~~~~~ + * + * If using fingerprint in an environment where the user’s IP address may + * change during the session, you should fingerprint only the useragent + * and/or accept header, or disable fingerprinting. + * + * If using fingerprint with an AWS load balancer, you should use one of + * the options that uses the “client IP” rather than the “remote IP”, + * fingerprint only useragent and/or accept header, or disable fingerprinting. + * + * @var int + * + */ +$config->sessionFingerprint = 1; + +/** + * Force current session IP address (overriding auto-detect) + * + * This overrides the return value of `$session->getIP()` method. + * Use this property only for setting the IP address. To get the IP address + * always use the `$session->getIP()` method instead. + * + * This is useful if you are in an environment where the remote IP address + * comes from some property other than the REMOTE_ADDR in $_SERVER. For instance, + * if you are using a load balancer, what’s usually detected as the IP address is + * actually the IP address between the load balancer and the server, rather than + * the client IP address. So in that case, you’d want to set this property as + * follows: + * ~~~~~ + * $config->sessionForceIP = $_SERVER['HTTP_X_FORWARDED_FOR']; + * ~~~~~ + * If you don’t have a specific need to override the IP address of the user + * then you should leave this blank. + * + * @var string + * + */ +$config->sessionForceIP = ''; + +/** + * Use secure cookies when on HTTPS? + * + * When enabled, separate sessions will be maintained for + * HTTP vs. HTTPS. This ensures the session is secure on HTTPS. + * The tradeoff is that switching between HTTP and HTTPS means + * that you may be logged in on one and not the other. + * + * 0 or false: secure cookies off + * 1 or true: secure cookies on (default) + * + * @var int + * + */ +$config->sessionCookieSecure = 1; + +/** + * Cookie domain for sessions + * + * Enables a session to traverse multiple subdomains. + * Specify a string having “.domain.com” (with leading period) or NULL to disable (default/recommended). + * + * @var string|null + * + */ +$config->sessionCookieDomain = null; + +/** + * Cookie “SameSite” value for sessions - “Lax” (default) or “Strict” + * + * - `Lax`: The session cookie will be sent along with the GET requests initiated by third party website. + * This ensures an existing session on this site is maintained when clicking to it from another site. + * + * - `Strict`: The session cookie will not be sent along with requests initiated by third party websites. + * If user already has a login session on this site, it won’t be recognized when clicking from another + * site to this one. + * + * The default/recommended value is `Lax`. + * + * @var string + * @since 3.0.178 + * @see https://www.php.net/manual/en/session.configuration.php#ini.session.cookie-samesite + * + */ +$config->sessionCookieSameSite = 'Lax'; + +/** + * Number of session history entries to record. + * + * When enabled (with a value > 0) a history of pageviews will be recorded in the + * session. These can be retrieved with $session->getHistory(). + * + * @var int + * + */ +$config->sessionHistory = 0; + +/** + * Hash method to use for passwords. + * + * Can be any available with your PHP's hash() installation. For instance, you may prefer + * to use something like sha256 if supported by your PHP installation. + * + * @deprecated Only here for backwards compatibility. + * + */ +$config->userAuthHashType = 'sha1'; + +/** + * Names (string) or IDs (int) of roles that are not allowed to login + * + * Note that you must create these roles yourself in the admin. When a user has + * one of these named roles, $session->login() will not accept a login from them. + * This affects the admin login form and any other login forms that use ProcessWire’s + * session system. + * + * The default value specifies a role name of "login-disabled", meaning if you create + * a role with that name, and assign it to a user, that user will no longer be able + * to login. + * + * @var array + * + */ +$config->loginDisabledRoles = array( + 'login-disabled' +); + + +/*** 4. TEMPLATE FILES **************************************************************************/ + +/** + * Allow template files to be compiled? + * + * Set to false to disable the option for compiled template files. + * When set to true, it will be used unless a given template's 'compile' option is set to 0. + * This setting also covers system status files like /site/ready.php, /site/init.php, etc. (3.0.142+) + * + * @var bool + * + */ +$config->templateCompile = strlen(__NAMESPACE__) > 0; + +/** + * Prepend template file + * + * PHP file in /site/templates/ that will be loaded before each page's template file. + * + * #notes Example: _init.php + * @var string + * + */ +$config->prependTemplateFile = ''; + +/** + * Append template file + * + * PHP file in /site/templates/ that will be loaded after each page's template file. + * + * #notes Example: _main.php + * @var string + * + */ +$config->appendTemplateFile = ''; + +/** + * Regular expression to ignore template files + * + * When checking for new template files, files matching this PCRE regex will be ignored. + * + * #notes The default setting of /^_/ ignores all files that begin with an underscore. + * @var string + * + */ +$config->ignoreTemplateFileRegex = '/^_/'; + +/** + * Expected extension for template files (we don't recommend changing this) + * + */ +$config->templateExtension = 'php'; + + + + +/*** 5. FILES & ASSETS ************************************************************************/ + +/** + * Directory mode + * + * Octal string permissions assigned to directories created by ProcessWire. + * Please avoid 0777 if at all possible as that is too open for most installations. + * Note that changing this does not change permissions for existing directories, + * only newly created directories. + * + * #notes See [chmod man page](http://ss64.com/bash/chmod.html). + * #pattern /^0[0-9]{3}$/ + * @var string + * + */ +$config->chmodDir = "0755"; + +/** + * File mode + * + * Octal string permissions assigned to files created by ProcessWire. + * Please avoid 0666 if at all possible as that is too open for most installations. + * Note that changing this does not change permissions for existing files, only newly + * created/uploaded files. + * + * #notes See [chmod man page](http://ss64.com/bash/chmod.html). + * #pattern /^0[0-9]{3}$/ + * @var string + * + */ +$config->chmodFile = "0644"; + +/** + * Set this to false if you want to suppress warnings about 0666/0777 permissions that are too open + * + * @var bool + * + */ +$config->chmodWarn = true; + +/** + * Bad file extensions for uploads + * + * File extensions that are always disallowed from uploads (each separated by a space). + * + * @var string + * + */ +$config->uploadBadExtensions = 'php php3 phtml exe cfm shtml asp pl cgi sh vbs jsp'; + +/** + * Secure page files? + * + * When, true, prevents http access to file assets of access protected pages. + * + * Set to true if you want files on non-public or unpublished pages to be + * protected from direct URL access. + * + * When used, such files will be delivered at a URL that is protected from public access. + * + * @var bool + * + */ +$config->pagefileSecure = false; + +/** + * String that prefixes filenames in PW URLs, becoming a shortcut to a page's file's URL + * + * This must be at the end of the URL. For the prefix "-/", a files URL would look like this: + * /path/to/page/-/filename.jpg => same as: /site/assets/files/123/filename.jpg + * + * This should be a prefix that is not the same as any page name, as it takes precedence. + * + * This prefix is deprecated. Insert this into your /site/config.php as a temporary fix only if you + * have broken images from tags placed in textarea fields. + * + * @deprecated + * + * $config->pagefileUrlPrefix = '-/'; + * + */ + +/** + * Prefix for secure page files + * + * One or more characters prefixed to the pathname of secured file dirs. + * + * If use of this feature originated with a pre-2.3 install, this may need to be + * specified as "." rather than "-". + * + */ +$config->pagefileSecurePathPrefix = '-'; + +/** + * Use extended file mapping? + * + * Enable this if you expect to have >30000 pages in your site. + * + * Set to true in /site/config.php if you want files to live in an extended path mapping system + * that limits the number of directories per path to under 2000. + * + * Use this on large sites living on file systems with hard limits on quantity of directories + * allowed per directory level. For example, ext2 and its 30000 directory limit. + * + * Please note that for existing sites, this applies only for new pages created from this + * point forward. + * + * #notes Warning: The extended file mapping feature is not yet widely tested, so consider it beta. + * @var bool + * + */ +$config->pagefileExtendedPaths = false; + +/** + * Allowed content types for output by template files + * + * When one of these options is selected for a template, the header will be sent + * automatically regardless of whether request is live or cached. + * + * The keys of the array are file extensions. They are used for identification + * and storage purposes. In ProCache, they are used as a file extension which + * connects a configured Apache MIME type to the appropriate content type header. + * + * @var array + * + */ +$config->contentTypes = array( + 'html' => 'text/html', + 'txt' => 'text/plain', + 'json' => 'application/json', + 'xml' => 'application/xml', +); + +/** + * File content types + * + * Connects file extentions to content-type headers, used by file passthru functions. + * + * Any content types that should be force-download should be preceded with a plus sign. + * The '?' index must be present to represent a default for all not present. + * + * @var array + * + */ +$config->fileContentTypes = array( + '?' => '+application/octet-stream', + 'txt' => '+text/plain', + 'csv' => '+text/csv', + 'pdf' => '+application/pdf', + 'doc' => '+application/msword', + 'docx' => '+application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'xls' => '+application/vnd.ms-excel', + 'xlsx' => '+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'ppt' => '+application/vnd.ms-powerpoint', + 'pptx' => '+application/vnd.openxmlformats-officedocument.presentationml.presentation', + 'rtf' => '+application/rtf', + 'gif' => 'image/gif', + 'jpg' => 'image/jpeg', + 'jpeg' => 'image/jpeg', + 'png' => 'image/png', + 'svg' => 'image/svg+xml', + 'webp' => 'image/webp', + 'zip' => '+application/zip', + 'mp3' => 'audio/mpeg', +); + +/** + * Named predefined image sizes and options + * + * Specify associative arrays of predefined image sizes indexed by name. + * Each item should have at least 'width' and 'height' indexes. But they can also have any + * other option accepted by the `Pageimage::size()` method `$options` argument. + * + * You can use your defined sizes by name in a Pageimage::size() call by specifying the + * size name rather than the `$width` argument, like this: + * ~~~~~~ + * $image = $page->images->first(); + * $landscape = $image->size('landscape'); + * echo "$landscape->description"; + * ~~~~~~ + * Feel free to completely overwrite the default $config->imageSizes in your /site/config.php + * file * as this particular setting is not used by the core. + * + * @var array + * @since 3.0.151 + * + */ +$config->imageSizes = array( + // Example 1: Landscape (try this one if you want to test the feature) + 'landscape' => array('width' => 600, 'height' => 300), + + // Example 2: Thumbnails in admin (260 height, proportional width) + // 'admin' => array('width' => 0, 'height' => 260), + + // Example 3: Portrait, with additional options: + // 'portrait' => array('width' => 300, 'height' => 500, 'quality' => 80, 'suffix' => 'portrait'), + + // Example 4: Square size cropping towards (preserving) top/center (north): + // 'squareNorth' => array('width' => 400, 'height' => 400, 'cropping' => 'north'), +); + +/** + * Image sizer options + * + * Default ImageSizer options, as used by $page->image->size(w, h), for example. + * + * #property bool upscaling Upscale if necessary to reach target size? (1=true, 0=false) + * #property bool cropping Crop if necessary to reach target size? (1=true, 0=false) + * #property bool autoRotation Automatically correct orientation? (1=true, 0=false) + * #property bool interlace Use interlaced JPEGs by default? Recommended. (1=true, 0=false) + * #property string sharpening Sharpening mode, enter one of: none, soft, medium, strong + * #property int quality Image quality, enter a value between 1 and 100, where 100 is highest quality (and largest files) + * #property float defaultGamma Default gamma of 0.5 to 4.0 or -1 to disable gamma correction (default=2.0) + * #property bool webpAdd Create a WEBP copy with every new image variation? (default=false) + * + * @var array + * + */ +$config->imageSizerOptions = array( + 'upscaling' => true, // upscale if necessary to reach target size? + 'cropping' => true, // crop if necessary to reach target size? + 'autoRotation' => true, // automatically correct orientation? + 'interlace' => false, // use interlaced JPEGs by default? (recommended) + 'sharpening' => 'soft', // sharpening: none | soft | medium | strong + 'quality' => 90, // quality: 1-100 where higher is better but bigger + 'hidpiQuality' => 60, // Same as above quality setting, but specific to hidpi images + 'defaultGamma' => 2.0, // defaultGamma: 0.5 to 4.0 or -1 to disable gamma correction (default=2.0) + 'webpAdd' => false, // set this to true, if the imagesizer engines should create a Webp copy with every (new) image variation +); + +/** + * Options for webp images + * + * #property int quality Quality setting where 1-100 where higher is better but bigger + * #property bool useSrcExt Use source file extension in webp filename? (file.jpg.webp rather than file.webp) + * #property bool useSrcUrlOnSize Fallback to source file URL when webp file is larger than source? + * #property bool useSrcUrlOnFail Fallback to source file URL when webp file fails for some reason? + * + * @var array + * + */ +$config->webpOptions = array( + 'quality' => 90, // Quality setting of 1-100 where higher is better but bigger + 'useSrcExt' => false, // Use source file extension in webp filename? (file.jpg.webp rather than file.webp) + 'useSrcUrlOnSize' => true, // Fallback to source file URL when webp file is larger than source? + 'useSrcUrlOnFail' => true, // Fallback to source file URL when webp file fails for some reason? +); + +/** + * Admin thumbnail image options + * + * Controls the output of the thumbnail images used in image fields presented in the admin. + * + * #property int width Width of thumbnails or 0 for proportional to height (default=0). + * #property int height Height of thumbnails or 0 for proportional to width (default=100). + * #property float scale Width/height scale (1=auto detect, 0.5=always hidpi, 1.0=force non-hidpi) + * #property bool upscaling Upscale if necessary to reach target size? (1=true, 0=false). + * #property bool cropping Crop if necessary to reach target size? (1=true, 0=false). + * #property bool autoRotation Automatically correct orientation? (1=true, 0=false). + * #property string sharpening Sharpening mode, enter one of: none, soft, medium, strong (default=soft). + * #property int quality Image quality, enter a value between 1 and 100, where 100 is highest quality, and largest files (default=90). + * #property string suffix Suffix to append to all thumbnail images (1-word of a-z 0-9, default=blank) + * + * @var array + * + */ +$config->adminThumbOptions = array( + 'width' => 0, // max width of admin thumbnail or 0 for proportional to height (@deprecated, for legacy use) + 'height' => 100, // max height of admin thumbnail or 0 for proportional to width (@deprecated, for legacy use) + 'gridSize' => 130, // Squared grid size for images (replaces the 'width' and 'height' settings) + 'scale' => 1, // admin thumb scale (1=allow hidpi, 0.5=always hidpi, 1.0=force non-hidpi) + 'upscaling' => false, + 'cropping' => true, + 'autoRotation' => true, // automatically correct orientation? + 'sharpening' => 'soft', // sharpening: none | soft | medium | strong + 'quality' => 90, + 'suffix' => '', +); + +/** + * File compiler options (as used by FileCompiler class) + * + * Enables modification of file compiler behaviors. See also $config->moduleCompile + * and $config->templateCompile settings. + * + * #property bool siteOnly Specify true to prevent compiler from attempting compilation outside files in /site/ (default=false). + * #property bool showNotices Show notices in admin about compiled files to superuser when logged in (default=true). + * #property bool logNotices Log notices about compiled files and maintenance to file-compiler.txt log (default=true). + * #property string chmodFile Mode to use for created files, i.e. "0644" (uses $config->chmodFile setting by default). + * #property string chmodDir Mode to use for created dirs, i.e. "0755" (uses $config->chmodDir setting by default). + * #property array exclusions Exclude paths that exist within any of these paths (default includes $config->paths->wire). + * #property array extensions File extensions that we compile (default=php, module, inc). + * #property string cachePath Path where compiled files are stored (default is $config->paths->cache . 'FileCompiler/') + * + * @var array + * + */ +$config->fileCompilerOptions = array( + 'siteOnly' => false, // only allow compilation of files in /site/ directory + 'showNotices' => true, // show notices about compiled files to superuser when logged in + 'logNotices' => true, // log notices about compiled files and maintenance to file-compiler.txt log. + 'chmodFile' => '', // mode to use for created files, i.e. "0644" + 'chmodDir' => '', // mode to use for created directories, i.e. "0755" + 'exclusions' => array(), // exclude filenames or paths that start with any of these + 'extensions' => array('php', 'module', 'inc'), // file extensions we compile + 'cachePath' => '', // path where compiled files are stored, or blank for $config->paths->cache . 'FileCompiler/' +); + +/** + * Temporary directory for uploads + * + * Optionally override PHP's upload_tmp_dir with your own. + * + * @var string + * + * $config->uploadTmpDir = dirname(__FILE__) . '/assets/uploads/'; // example + * + */ + + +/*** 6. HTTP & INPUT **************************************************************************/ + +/** + * HTTP hosts + * + * For added security, specify the host names ProcessWire should recognize. + * + * If your site may be accessed from multiple hostnames, you'll also want to use this setting. + * If left empty, the httpHost will be determined automatically, but use of this whitelist + * is recommended for production environments. + * + * If your hostname uses a port other than 80, make sure to include that as well. + * For instance "localhost:8888". + * + * @var array + * + */ +$config->httpHosts = array(); + +/** + * Runtime HTTP host + * + * This is set automatically by ProcessWire at runtime, consisting of one of the values + * specified in $config->httpHosts. However, if you set a value for this, it will override + * ProcessWire's runtime value. + * + */ +$config->httpHost = ''; + +/** + * Protect CSRF? + * + * Enables CSRF (cross site request forgery) protection on all PW forms, recommended for improved security. + * + * @var bool + * + */ +$config->protectCSRF = true; + +/** + * Maximum URL segments + * + * Maximum number of extra stacked URL segments allowed in a page's URL (including page numbers). + * + * i.e. /path/to/page/s1/s2/s3 where s1, s2 and s3 are URL segments that don't resolve to a page, but can be + * checked in the API via $input->urlSegment1, $input->urlSegment2, $input->urlSegment3, etc. + * To use this, your template settings (under the URL tab) must take advantage of it. Only change this + * number if you need more (or fewer) URL segments for some reason. + * + * Do not change this number below 3, as the admin requires up to 3 URL segments. + * + * @var int + * + */ +$config->maxUrlSegments = 4; + +/** + * Maximum length for any individual URL segment (default=128) + * + * @var int + * + */ +$config->maxUrlSegmentLength = 128; + +/** + * Maximum URL/path slashes (depth) for request URLs + * + * The maximum number of slashes that any path requested from ProcessWire may have. + * Maximum possible value is 60. Minimum recommended value is 10. + * + * @var int + * + */ +$config->maxUrlDepth = 30; + +/** + * Pagination URL prefix + * + * Default prefix used for pagination, i.e. "page2", "page3", etc. + * + * If using multi-language page names, please use the setting in LanguageSupportPageNames module settings instead. + * + * @var string + * + */ +$config->pageNumUrlPrefix = 'page'; // note that "-" is not a supported character in the prefix + +/** + * Multiple prefixes that may be used for detecting pagination + * + * Typically used for multi-language support and populated automatically at runtime by + * multi-language support modules. When populated, they override $config->pageNumUrlPrefix. + * + * @internal + * + * $config->pageNumUrlPrefixes = array(); + * + */ + +/** + * Character set for page names + * + * Set to 'UTF8' (uppercase) to allow for non-ascii word characters in page names. + * You must also update the .htaccess file to allow non-ascii characters through. + * See also $config->pageNameWhitelist, which is used if pageNameCharset is UTF8. + * + * @var string + * + * #notes Value may be either 'ascii' (lowercase) or 'UTF8' (uppercase). + * + */ +$config->pageNameCharset = 'ascii'; + +/** + * If 'pageNameCharset' is 'UTF8' then specify the whitelist of allowed characters here + * + * Please note this whitelist is only used if pageNameCharset is 'UTF8'. + * + * @var string + * + */ +$config->pageNameWhitelist = '-_.abcdefghijklmnopqrstuvwxyz0123456789æåäßöüđжхцчшщюяàáâèéëêěìíïîõòóôøùúûůñçčćďĺľńňŕřšťýžабвгдеёзийклмнопрстуфыэęąśłżź'; + +/** + * Name to use for untitled pages + * + * When page has this name, the name will be changed automatically (to a field like title) when it is possible to do so. + * + * @var string + * + */ +$config->pageNameUntitled = "untitled"; + +/** + * Maximum paginations + * + * Maxmum number of supported paginations when using page numbers. + * + * @var int + * + */ +$config->maxPageNum = 999; + +/** + * Input variable order + * + * Order that variables with the $input API var are handled when you access $input->some_var. + * + * This does not affect the dedicated $input->[get|post|cookie|whitelist] variables/functions. + * To disable $input->some_var from considering get/post/cookie, make this blank. + * + * #notes Possible values are a combination of: "get post cookie whitelist" in any order, separated by 1 space. + * + * @var string + * + */ +$config->wireInputOrder = 'get post'; + +/** + * Lazy-load get/post/cookie input into $input API var? + * + * This is an experimental option for reduced memory usage when a lot of input data is present. + * + * This prevents PW from keeping separate copies of get/post/cookie data, and it instead works + * directly from the PHP $_GET, $_POST and $_COOKIE vars. + * + * This option is also useful in that anything you SET to PW’s $input->get/post/cookie also gets + * set to the equivalent PHP $_GET, $_POST and $_COOKIE. + * + * @var bool + * + */ +$config->wireInputLazy = false; + +/** + * Maximum depth for input variables accessed from $input + * + * A value of 1 (or less) means only single dimensional arrays are allowed. For instance, `$a['foo']` + * would be allowed (since it is one dimension), but `$a['foo']['bar']` would not because it is + * multi-dimensional to a depth of 2. + * + * A value of 2 or higher enables multi-dimensional arrays to that depth. For instance, a value of 2 + * would allow `$a['foo']['bar']` and a value of 3 or higher would enable `$a['foo']['bar']['baz']`. + * + * Note: if your use case requires multi-dimensional input arrays and you do not have control over + * this setting (like if you are a 3rd party module author), or are using a version of PW prior to + * 3.0.178 you can always still access multi-dimensional arrays directly from `$_GET` or `$_POST`. + * + * @var int + * @since 3.0.178 + * + */ +$config->wireInputArrayDepth = 1; + +/** + * Options for setting cookies from $input->cookie()->set(...) + * + * Additional details about some of these options can also be found on PHP’s [setcookie](https://www.php.net/manual/en/function.setcookie.php) doc page. + * + * #property int age Max age of cookies in seconds or 0 to expire with session (3600=1hr, 86400=1day, 604800=1week, 2592000=30days, etc.) + * #property string|null Cookie path or null for PW installation’s root URL (default=null). + * #property string|null|bool domain Cookie domain: null for current hostname, true for all subdomains of current domain, domain.com for domain and all subdomains, www.domain.com for www subdomain. + * #property string samesite When set to “Lax” cookies are preserved on GET requests to this site originated from external links. May also be 'Strict' or 'None' ('secure' option required for 'None'). 3.0.178+ + * #property bool|null secure Transmit cookies only over secure HTTPS connection? (true, false, or null to auto-detect, using true option for cookies set when HTTPS is active). + * #property bool httponly When true, cookie is http/server-side and not visible to JS code in most browsers. + * + * @var array + * @since 3.0.141 + * + */ +$config->cookieOptions = array( + 'age' => 604800, // Max age of cookies in seconds or 0 to expire with session (3600=1hr, 86400=1day, 604800=1week, 2592000=30days, etc.) + 'path' => null, // Cookie path/URL or null for PW installation’s root URL (default=null). + 'domain' => null, // Cookie domain: null for current hostname, true for all subdomains of current domain, domain.com for domain and all subdomains, www.domain.com for www subdomain. + 'secure' => null, // Transmit cookies only over secure HTTPS connection? (true, false, or null to auto-detect, substituting true for cookies set when HTTPS is active). + 'samesite' => 'Lax', // When set to “Lax” cookies are preserved on GET requests to this site originated from external links. May also be 'Strict' or 'None' ('secure' option required for 'None'). + 'httponly' => false, // When true, cookie is http/server-side only and not visible to client-side JS code. + 'fallback' => true, // If set cookie fails (perhaps due to output already sent), attempt to set at beginning of next request? (default=true) +); + + +/*** 7. DATABASE ********************************************************************************/ + +/** + * Database name + * + */ +$config->dbName = '__DB_NAME__'; + +/** + * Database username + * + */ +$config->dbUser = '__DB_USER__'; + +/** + * Database password + * + */ +$config->dbPass = '__DB_PWD__'; + +/** + * Database host + * + */ +$config->dbHost = 'localhost'; + +/** + * Database port + * + */ +$config->dbPort = 3306; + +/** + * Database character set + * + * utf8 is the only recommended value for this. + * + * Note that you should probably not add/change this on an existing site. i.e. don't add this to + * an existing ProcessWire installation without asking how in the ProcessWire forums. + * + */ +$config->dbCharset = 'utf8'; + +/** + * Database engine + * + * May be 'InnoDB' or 'MyISAM'. Avoid changing this after install. + * + */ +$config->dbEngine = 'MyISAM'; + +/** + * Allow MySQL query caching? + * + * Set to false to to disable query caching. This will make everything run slower so should + * only used for DB debugging purposes. + * + * @var bool + * + */ +$config->dbCache = true; + +/** + * MySQL database exec path + * + * Path to mysql/mysqldump commands on the file system + * + * This enables faster backups and imports when available. + * + * Example: /usr/bin/ + * Example: /Applications/MAMP/Library/bin/ + * + * @param string + * + */ +$config->dbPath = ''; + +/** + * Force lowercase tables? + * + * Force any created field_* tables to be lowercase. + * Recommend value is true except for existing installations that already have mixed case tables. + * + */ +$config->dbLowercaseTables = true; + +/** + * Database init command (PDO::MYSQL_ATTR_INIT_COMMAND) + * + * Note: Placeholder "{charset}" gets automatically replaced with $config->dbCharset. + * + * @var string + * + */ +$config->dbInitCommand = "SET NAMES '{charset}'"; + +/** + * Set or adjust SQL mode per MySQL version + * + * Array indexes are minimum MySQL version mode applies to. Array values are + * the names of the mode(s) to apply. If value is preceded with "remove:" the mode will + * be removed, or if preceded with "add:" the mode will be added. If neither is present + * then the mode will be set exactly as given. To specify more than one SQL mode for the + * value, separate them by commas (CSV). To specify multiple statements for the same + * version, separate them with a slash "/". + * + * ~~~~~ + * array("5.7.0" => "remove:STRICT_TRANS_TABLES,ONLY_FULL_GROUP_BY/add:NO_ZERO_DATE") + * ~~~~~ + * + * @var array + * + */ +$config->dbSqlModes = array( + "5.7.0" => "remove:STRICT_TRANS_TABLES,ONLY_FULL_GROUP_BY" +); + +/** + * A key=>value array of any additional driver-specific connection options. + * + * @var array + * + */ +$config->dbOptions = array(); + +/** + * Optional DB socket config for sites that need it (for most you should exclude this) + * + * @var string + * + */ +$config->dbSocket = ''; + +/** + * Maximum number of queries WireDatabasePDO will log in memory (when $config->debug is enabled) + * + * @var int + * + */ +$config->dbQueryLogMax = 500; + +/** + * Remove 4-byte characters (like emoji) when dbEngine is not utf8mb4? + * + * When charset is not “utf8mb4” and this value is true, 4-byte UTF-8 characters are stripped + * out of inserted values when possible. Note that this can add some overhead to INSERTs. + * + * @var bool + * + */ +$config->dbStripMB4 = false; + +/** + * Optional settings for read-only “reader” database connection + * + * All `$config->db*` settings above are for a read/write database connection. You can + * optionally maintain a separate read-only database connection to reduce costs and + * allow for further database scalability. Use of this feature requires an environment + * that supports a separate read-only database connection to the same database used by the + * read/write connection. When enabled, ProcessWire will direct all non-writing queries to + * the read-only connection, while queries that write to the database are directed to the + * read/write connection. + * + * Specify one or more existing `$config->db*` settings in the array to use that value for + * the read-only connection. To enable a separate read-only database connection, this array + * must contain at minimum a `host` or `socket` entry. Beyond that, values not present in + * this array will be pulled from the existing `$config->db*` settings. Note, when specifying + * settings in this array, omit the `db` prefix and use lowercase for the first letter. For + * example, use `host` rather than `dbHost`, `name` rather than `dbName`, etc. + * + * When using this feature, you may want to exclude your admin from it, as the admin is an + * environment that's designed for both read and write, so there's less reason to maintain + * separate read-only and read/write connections in the admin. See the examples below. + * + * For more details see: https://processwire.com/blog/posts/pw-3.0.175/ + * + * ~~~~~ + * // allow read-only database connection always… + * $config->dbReader = [ + * 'host' => 'readonly.mydb.domain.com' + * ]; + * + * // …or, use read-only connection only if not in the admin… + * if(!$config->requestPath('/processwire/')) { + * $config->dbReader = [ 'host' => 'readonly.mydb.domain.com' ]; + * } + * + * // …or limit read-only to GET requests, exclude admin and contact page… + * $skipPaths = [ '/processwire/', '/contact/' ]; + * if($config->requestMethod('GET') && !$config->requestPath($skipPaths)) { + * $config->dbReader = [ 'host' => 'readonly.mydb.domain.com' ]; + * } + * + * // to have PW randomly select from multiple DB readers, nest the arrays (3.0.176+) + * // if a connection fails, PW will try another randomly till it finds one that works + * $config->dbReader = [ + * [ 'host' => 'mydb1.domain.com' ], + * [ 'host' => 'mydb2.domain.com' ], + * [ 'host' => 'mydb3.domain.com' ], + * ]; + * ~~~~~ + * + * @var array + * @since 3.0.175 + * @see https://processwire.com/blog/posts/pw-3.0.175/ + * + */ +$config->dbReader = array( + // 'host' => 'readonly.mydb.domain.com', + // 'port' => 3306, + // 'name' => 'mydb', + // …etc., though most likely you will only need 'host' entry to setup a reader +); + +/*** 8. MODULES *********************************************************************************/ + +/** + * Use compiled modules? + * + * Set to false to disable the use of compiled modules. + * Set to true to enable PW to compile modules when it determines it is necessary. + * We recommend keeping this set to true unless all modules in use support PW 3.x natively. + * + * @var bool + * + */ +$config->moduleCompile = true; + +/** + * Modules service URL + * + * URL to modules directory service JSON feed. + * + * @var string + * + */ +$config->moduleServiceURL = 'https://modules.processwire.com/export-json/'; + +/** + * Modules service API key + * + * API key for modules directory service. + * + * @var string + * + */ +$config->moduleServiceKey = 'pw301'; + +/** + * Allowed module installation options (in admin) + * + * Module installation options you want to be available from the admin Modules > Install tab. + * For any of the options below, specify boolean `true` to allow, `false` to disallow, or + * specify string `'debug'` to allow only when ProcessWire is in debug mode. + * + * - `directory`: Allow installation or upgrades from ProcessWire modules directory? + * - `upload`: Allow installation by file upload? + * - `download`: Allow installation by file download from URL? + * + * @var array + * @since 3.0.163 + * + */ +$config->moduleInstall = array( + 'directory' => 'debug', // allow install from ProcessWire modules directory? + 'upload' => 'debug', // allow install by module file upload? + 'download' => 'debug', // allow install by download from URL? +); + +/** + * Substitute modules + * + * Names of substitutute modules for when requested module doesn't exist + * + * #notes Specify ModuleName = ReplacementModuleName + * @var array + * + */ +$config->substituteModules = array( + // TinyMCE replaced with CKEditor as default RTE in 2.4.9+ + 'InputfieldTinyMCE' => 'InputfieldCKEditor' +); + +/** + * WireMail module(s) default settings + * + * Note you can add any other properties to the wireMail array that are supported by WireMail settings + * like we’ve done with from, fromName and headers here. Any values set here become defaults for the + * WireMail module. + * + * Blacklist property + * ================== + * The blacklist property lets you specify email addresses, domains, partial host names or regular + * expressions that prevent sending to certain email addresses. This is demonstrated by example: + * ~~~~~ + * // Example of blacklist definition + * $config->wireMail('blacklist', [ + * 'email@domain.com', // blacklist this email address + * '@host.domain.com', // blacklist all emails ending with @host.domain.com + * '@domain.com', // blacklist all emails ending with @domain.com + * 'domain.com', // blacklist any email address ending with domain.com (would include mydomain.com too). + * '.domain.com', // blacklist any email address at any host off domain.com (domain.com, my.domain.com, but NOT mydomain.com). + * '/something/', // blacklist any email containing "something". PCRE regex assumed when "/" is used as opening/closing delimiter. + * '/.+@really\.bad\.com$/', // another example of using a PCRE regular expression (blocks all "@really.bad.com"). + * ]); + * + * // Test out the blacklist + * $email = 'somebody@bad-domain.com'; + * $result = $mail->isBlacklistEmail($email, [ 'why' => true ]); + * if($result === false) { + * echo "

Email address is not blacklisted

"; + * } else { + * echo "

Email is blacklisted by rule: $result

"; + * } + * ~~~~~ + * + * #property string module Name of WireMail module to use or blank to auto-detect. (default='') + * #property string from Default from email address, when none provided at runtime. (default=$config->adminEmail) + * #property string fromName Default from name string, when none provided at runtime. (default='') + * #property string newline What to use for newline if different from RFC standard of "\r\n" (optional). + * #property array headers Default additional headers to send in email, key=value. (default=[]) + * #property array blacklist Email blacklist addresses or rules. (default=[]) + * + * @var array + * + */ +$config->wireMail = array( + 'module' => '', + 'from' => '', + 'fromName' => '', + 'headers' => array(), + 'blacklist' => array() +); + +/** + * PageList default settings + * + * Note that 'limit' and 'speed' can also be overridden in the ProcessPageList module settings. + * The 'useHoverActions' are currently only known compatible with AdminThemeDefault. + * + * #property int limit Number of items to show per pagination (default=50) + * #property int speed Animation speed in ms for opening/closing lists (default=200) + * #property bool useHoverActions Show page actions when page is hovered? (default=false) + * #property int hoverActionDelay Delay in ms between hovering a page and showing the actions (default=100) + * #property int hoverActionFade Time in ms to spend fading in or out the actions (default=100) + * + * @var array + * + */ +$config->pageList = array( + 'limit' => 50, + 'speed' => 200, + 'useHoverActions' => true, + 'hoverActionDelay' => 100, + 'hoverActionFade' => 100 +); + +/** + * PageEdit default settings + * + * #property bool viewNew Specify true to force the "view" link to open pages in a new window. + * #property bool confirm Notify user if they attempt to navigate away from unsaved changes? + * #property bool ajaxChildren Whether to load the 'children' tab via ajax + * #property bool ajaxParent Whether to load the 'parent' field via ajax + * #property bool editCrumbs Whether or not breadcrumbs load page editor (false=load page list). + * + * @var array + * + */ +$config->pageEdit = array( + 'viewNew' => false, + 'confirm' => true, + 'ajaxChildren' => true, + 'ajaxParent' => true, + 'editCrumbs' => false, +); + +/** + * PageAdd default settings + * + * #property string noSuggestTemplates Disable suggestions for new pages (1=disable all, or specify template names separated by space) + * + */ +$config->pageAdd = array( + 'noSuggestTemplates' => '', +); + +/** + * MarkupQA (markup quality assurance) optional settings + * + * This is used by Textarea Fieldtype when enabled and using content-type HTML. + * + * #property array ignorePaths Paths that begin with any of these will be ignored and left alone (not abstracted), i.e. [ '/a/b/', '/c/d/' ] + * #property bool debug Show debugging info to superusers? (default=false). May also be specified in $config->debugMarkupQA. + * + * @var array + * + */ +$config->markupQA = array( + // 'ignorePaths' => [ "/some/path/", "/another/path/", "/and/so/on/" ], + // 'debug' => true, +); + +/*** 9. MISC ************************************************************************************/ + +/** + * Additional core logs + * + * All activities from the API functions corresponding with the given log names will be logged. + * Options that can be specified are: pages, fields, templates, modules, exceptions, deprecated. + * + * Use log "deprecated" to log deprecated calls (during development only). + * + * @var array + * + */ +$config->logs = array( + 'modules', + 'exceptions', +); + +/** + * Include IP address in logs, when applicable? + * + * @var bool + * + */ +$config->logIP = false; + +/** + * Default admin theme + * + * Module name of default admin theme for guest and users that haven't already selected one + * + * Core options include: **AdminThemeDefault** or **AdminThemeReno** or **AdminThemeUikit**. + * Additional options will depend on what other 3rd party AdminTheme modules you have installed. + * + * @var string + * + */ +$config->defaultAdminTheme = 'AdminThemeDefault'; + +/** + * Admin email address + * + * Optional email address to send fatal error notifications to. + * + * #input email + * @var string + * + */ +$config->adminEmail = ''; + +/** + * Settings specific to AdminThemeUikit + * + * The settings shown below are only configured with this setting and not with the module config. + * + * Please note, in the `customLessFiles` and `customCssFile` settings, the paths `/site/templates/`, + * `/site/assets/`, and `/site/modules/` are converted to their actual values at runtime (if different). + * Any other paths are left as-is, but must be relative to the ProcessWire installation root. Meaning, + * anything in /site/ must start with /site/ and not /subdir/site/ or /path/to/site/, regardless of + * whether ProcessWire is running from the domain root or a subdirectory. + * + * @var array + * @since 3.0.179 + * + * #property string style Admin theme base style: 'reno', 'rock', blank for system default + * #property bool recompile Specify true for one request to force recompile of admin LESS to CSS in that request. Remember to set back to false. + * #property bool compress Compress compiled CSS? + * #property array customLessFiles Custom .less files to include, relative to PW installation root. + * #property string customCssFile Target custom .css file to compile custom .less file(s) to. + * + */ +$config->AdminThemeUikit = array( + 'style' => '', + 'recompile' => false, + 'compress' => true, + 'customLessFiles' => array('/site/templates/admin.less'), + 'customCssFile' => '/site/assets/admin.css', +); + +/** + * Fatal error HTML + * + * HTML used for fatal error messages in HTTP mode. + * + * This should use inline styles since no guarantee stylesheets are present when these are displayed. + * String should contain two placeholders: {message} and {why} + * + * #input textarea + * @var string + * + */ +$config->fatalErrorHTML = "

{message}

{why}

"; + +/** + * HTTP code to send for fatal error (typically 500 or 503) + * + * @var int + * @since 3.0.151 + * + */ +$config->fatalErrorCode = 500; + +/** + * Settings for modal windows + * + * Most PW modals use the "large" setting. The comma separated dimensions represent: + * + * 1. Start at pixels from top + * 2. Start at pixels from left + * 3. Width: 100% minus this many pixels + * 4. Height: 100% minus this many pixels + * + * Following that you may optionally specify any of the following, in any order. + * They must continue to be in CSV format, i.e. "key=value,key=value,key=value". + * + * 5. modal=true (whether dialog will have modal behavior, specify false to disable) + * 6. draggable=false (whether dialog is draggable, specify true to enable)* + * 7. resizable=true (whether dialog is resizable, specify false to disable) + * 8. hideOverflow=true (whether overflow in parent should be hidden, specify false to disable) + * 9. hide=250 (number of ms to fade out window after closing, default=250) + * 10. show=100 (number of ms to fade in window when opening, default=100) + * 11. closeOnEscape=false (whether hitting the ESC key should close the window, specify true to enable) + * + * The "large" modal option below demonstrates a few of these. + * + * *Note the draggable option does not work well unless the modal will open at the top of the + * page. Do not use on modals that may be triggered further down the page. + * + * @var array + * #property string large Settings for large modal windows (most common) + * #property string medium Settings for medium modal windows + * #property string small Settings for small modal windows + * #property string full Settings for full-screen modal windows + * + */ +$config->modals = array( + 'large' => "15,15,30,30,draggable=false,resizable=true,hide=250,show=100", + 'medium' => "50,49,100,100", + 'small' => "100,100,200,200", + 'full' => "0,0,0,0", +); + +/** + * Cache names to preload + * + * Consists of the cache name/token for any caches that we want to be preloaded at boot time. + * This is an optimization that can reduce some database overhead. + * + * @var array + * @deprecated No longer in use as of 3.0.218 + * + */ +$config->preloadCacheNames = array( + //'Modules.info', + //'ModulesVerbose.info', + //'ModulesVersions.info', + //'Modules.wire/modules/', + //'Modules.site/modules/', +); + +/** + * Allow Exceptions to propagate? + * + * When true, ProcessWire will not capture Exceptions and will instead let them fall + * through in their original state. Use only if you are running ProcessWire with your + * own Exception handler. Most installations should leave this at false. + * + * @var bool + * + */ +$config->allowExceptions = false; + +/** + * X-Powered-By header behavior + * + * - true: Sends the generic PW header, replacing any other powered-by headers (recommended). + * - false: Sends blank powered-by, replacing any other powered-by headers. + * - null: Sends no powered-by, existing server powered-by headers will pass through. + * + * @var bool|null + * + */ +$config->usePoweredBy = true; + +/** + * Chunk size for lazy-loaded pages used by $pages->findMany() + * + * @var int + * + */ +$config->lazyPageChunkSize = 250; + +/** + * Settings specific to InputfieldWrapper class + * + * Setting useDependencies to false may enable to use depencencies in some places where + * they aren't currently supported, like files/images and repeaters. Note that setting it + * to false only disables it server-side. The javascript dependencies work either way. + * + * Uncomment and paste into /site/config.php if you want to use this + * + * $config->InputfieldWrapper = array( + * 'useDependencies' => true, + * 'requiredLabel' => 'Missing required value', + * 'columnWidthSpacing' => 0, + * ); + * + */ + +/** + * statusFiles: Optional automatic include files when ProcessWire reaches each status/state + * + * **Using status/state files:** + * + * - These files must be located in your /site/ directory, i.e. /site/ready.php. + * - If a file does not exist, PW will see that and ignore it. + * - For any state/status files that you don’t need, it is preferable to make them + * blank or remove them, so that PW does not have to check if the file exists. + * - It is also preferable that included files have the ProcessWire namespace, and it is + * required that a `boot` file (if used) have the Processwire namespace. + * - The `init` and `ready` status files are called *after* autoload modules have had their + * corresponding methods (init or ready) called. Use `_init` or `_ready` (with leading + * underscore) as the keys to specify files that should instead be called *before* the state. + * - While php files in /site/ are blocked from direct access by the .htaccess file, it’s + * also a good idea to add `if(!defined("PROCESSWIRE")) die();` at the top of them. + * + * **Status files and available API variables:** + * + * - Included files receive current available ProcessWire API variables, locally scoped. + * - In the `boot` state, only $wire, $hooks, $config, $classLoader API variables are available. + * - In the `init` state, all core API variables are available, except for $page. + * - In the `ready`, `render`, `download` and `finished` states, all API variables are available. + * - In the `failed` state, an unknown set of API variables is available, so use isset() to check. + * + * **Description of statuses/states:** + * + * The statuses occur in this order: + * + * 1. The `boot` status occurs in the ProcessWire class constructor, after PW has initialized its + * class loader, loaded its config files, and initialized its hooks system. One use for this + * state is to add static hooks to methods that might be executed between boot and init, which + * would be missed by the time the init state is reached. + * + * 2. The `init` status occurs after ProcessWire has loaded all of its core API variables, except + * that the $page API variable has not yet been determined. At this point, all of the autoload + * modules have had their init() methods called as well. + * + * - If you want to target the state right before modules.init() methods are called, (rather + * than after), you can use `initBefore`. + * + * 3. The `ready` status is similar to the init status except that the current Page is now known, + * and the $page API variable is known and available. The ready file is included after autoload + * modules have had their ready() methods called. + * + * - If you want to limit your ready file to just be called for front-end (site) requests, + * you can use `readySite`. + * + * - If you want to limit your ready file to just be called for back-end (admin) requests with + * a logged-in user, you can use `readyAdmin`. + * + * - If you want to target the state right before modules.ready() methods are called, (rather + * than after), you can use `readyBefore`. This is the same as the init state, except that + * the current $page is available. + * + * 4. The `render` status occurs when a page is about to be rendered and the status is retained + * until the page has finished rendering. If using a status file for this, in addition to API + * variables, it will also receive a `$contentType` variable that contains the matched content- + * type header, or it may be blank for text/html content-type, or if not yet known. If externally + * bootstrapped it will contain the value “external”. + * + * 5. The `download` status occurs when a file is about to be sent as a download to the user. + * It occurs *instead* of a render status (rather than in addition to). If using an include file + * for this, in addition to API vars, it will also receive a `$downloadFile` variable containing + * the filename requested to be downloaded (string). + * + * 6. The `finished` status occurs after the request has been delivered and output sent. ProcessWire + * performs various maintenance tasks during this state. + * + * 7. The `failed` status occurs when the request has failed due an Exception being thrown. + * In addition to available API vars, it also receives these variables: + * + * - `$exception` (\Exception): The Exception that triggered the failed status, this is most + * commonly going to be a Wire404Exception, WirePermissionException or WireException. + * - `$reason` (string): Additional text info about error, beyond $exception->getMessage(). + * - `$failPage` (Page|NullPage): Page where the error occurred + * + * **Defining status files:** + * + * You can define all of the status files at once using an array like the one this documentation + * is for, but chances are you want to set one or two rather than all of them. You can do so like + * this, after creating /site/boot.php and site/failed.php files (as examples): + * ~~~~~ + * $config->statusFiles('boot', 'boot.php'); + * $config->statusFiles('failed', 'failed.php'); + * ~~~~~ + * + * @since 3.0.142 + * @var array + * + * #property string boot File to include for 'boot' state. + * #property string init File to include for 'init' state. + * #property string initBefore File to include right before 'init' state, before modules.init(). + * #property string ready File to include for API 'ready' state. + * #property string readyBefore File to include right before 'ready'state, before modules.ready(). + * #property string readySite File to include for 'ready' state on front-end/site only. + * #property string readyAdmin File to include for 'ready' state on back-end/admin only. + * #property string download File to include for API 'download' state (sending file to user). + * #property string render File to include for the 'render' state (always called before). + * #property string finished File to include for the 'finished' state. + * #property string failed File to include for the 'failed' state. + * + */ +$config->statusFiles = array( + 'boot' => '', + 'initBefore' => '', + 'init' => 'init.php', + 'readyBefore' => '', + 'ready' => 'ready.php', + 'readySite' => '', + 'readyAdmin' => '', + 'render' => '', + 'download' => '', + 'finished' => 'finished.php', + 'failed' => '', +); + +/** + * adminTemplates: Names of templates that ProcessWire should consider exclusive to the admin + * + * @since 3.0.142 + * @var array + * + */ +$config->adminTemplates = array('admin'); + + +/*** 10. RUNTIME ******************************************************************************** + * + * The following are runtime-only settings and cannot be changed from /site/config.php + * + */ + +/** + * https: This is automatically set to TRUE when the request is an HTTPS request, null when not determined. + * + */ +$config->https = null; + +/** + * ajax: This is automatically set to TRUE when the request is an AJAX request. + * + */ +$config->ajax = false; + +/** + * modal: This is automatically set to TRUE when request is in a modal window. + * + */ +$config->modal = false; + +/** + * external: This is automatically set to TRUE when PW is externally bootstrapped. + * + */ +$config->external = false; + +/** + * status: Current runtime status (corresponding to ProcessWire::status* constants) + * + */ +$config->status = 0; + +/** + * admin: TRUE when current request is for a logged-in user in the admin, FALSE when not, 0 when not yet known + * + * @since 3.0.142 + * + */ +$config->admin = 0; + +/** + * cli: This is automatically set to TRUE when PW is booted as a command line (non HTTP) script. + * + */ +$config->cli = false; + +/** + * version: This is automatically populated with the current PW version string (i.e. 2.5.0) + * + */ +$config->version = ''; + +/** + * versionName: This is automatically populated with the current PW version name (i.e. 2.5.0 dev) + * + */ +$config->versionName = ''; + +/** + * column width spacing for inputfields: used by some admin themes to communicate to InputfieldWrapper + * + * Value is null, 0, or 1 or higher. This should be kept at null in this file. + * + * This can also be specified with $config->InputfieldWrapper('columnWidthSpacing', 0); (3.0.158+) + * + */ +$config->inputfieldColumnWidthSpacing = null; + +/** + * Populated to contain tags for document head + * + * This is populated only after a MarkupPagerNav::render() has rendered pagination and is + * otherwise null. + * + * $config->pagerHeadTags = ''; + * + */ + +/*** 11. SYSTEM ********************************************************************************* + * + * Values in this section are not meant to be changed + * + */ + +$config->rootPageID = 1; +$config->adminRootPageID = 2; +$config->trashPageID = 7; +$config->loginPageID = 23; +$config->http404PageID = 27; +$config->usersPageID = 29; +$config->usersPageIDs = array(29); // if multiple needed +$config->rolesPageID = 30; +$config->externalPageID = 27; +$config->permissionsPageID = 31; +$config->guestUserPageID = 40; +$config->superUserPageID = 41; +$config->guestUserRolePageID = 37; +$config->superUserRolePageID = 38; +$config->userTemplateID = 3; +$config->userTemplateIDs = array(3); // if multiple needed +$config->roleTemplateID = 4; +$config->permissionTemplateID = 5; + +/** + * Page IDs that will be preloaded with every request + * + * This reduces number of total number of queries by reducing some on-demand queries + * + */ +$config->preloadPageIDs = array( + 1, // root/homepage + 2, // admin + 28, // access + 29, // users + 30, // roles + 37, // guest user role + 38, // super user role + 40, // guest user +); + +/** + * Unix timestamp of when this ProcessWire installation was installed + * + * This is set in /site/config.php by the installer. It is used for auto-detection + * of when certain behaviors must remain backwards compatible. When this value is 0 + * then it is assumed that all behaviors must remain backwards compatible. Once + * established in /site/config.php, this value should not be changed. If your site + * config file does not specify this setting, then you should not add it. + * + */ +$config->installed = 0; From 7e2e5398b2880d19b4311e5aed1b6f987f66ea26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:28:22 +0100 Subject: [PATCH 13/14] cleaning --- conf/config.php | 2 +- conf/nginx.conf | 4 ++-- manifest.toml | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/conf/config.php b/conf/config.php index 035dba4..4c1be94 100644 --- a/conf/config.php +++ b/conf/config.php @@ -936,7 +936,7 @@ $config->fileCompilerOptions = array( * @var array * */ -$config->httpHosts = array(); +$config->httpHosts = array(__DOMAIN__); /** * Runtime HTTP host diff --git a/conf/nginx.conf b/conf/nginx.conf index a792973..36f026b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,12 +4,12 @@ location __PATH__/ { # Path to source alias __INSTALL_DIR__/; - index index.php; + index index.php index.html; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file client_max_body_size 100M; - try_files $uri $uri/ /index.php?it=$uri&$args; + try_files $uri $uri/ /index.php?it=$uri&$args; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; diff --git a/manifest.toml b/manifest.toml index bec6a04..62041b3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,12 +41,6 @@ ram.runtime = "50M" type = "group" default = "visitors" - [install.admin] - type = "user" - - [install.password] - type = "password" - [resources] [resources.sources.main] url = "https://github.com/processwire/processwire/archive/refs/tags/3.0.227.zip" From e060c762a6dc2fc6ec53244ca4d7f94b8442d084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 09:29:57 +0100 Subject: [PATCH 14/14] Update config.php --- conf/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.php b/conf/config.php index 4c1be94..9665ec7 100644 --- a/conf/config.php +++ b/conf/config.php @@ -936,7 +936,7 @@ $config->fileCompilerOptions = array( * @var array * */ -$config->httpHosts = array(__DOMAIN__); +$config->httpHosts = array(); /** * Runtime HTTP host @@ -946,7 +946,7 @@ $config->httpHosts = array(__DOMAIN__); * ProcessWire's runtime value. * */ -$config->httpHost = ''; +$config->httpHost = '__DOMAIN__'; /** * Protect CSRF?