From be9dbb873bf31140642230ee40ca6e8970eb29fa Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Mar 2023 09:50:39 +0100 Subject: [PATCH 1/7] fix --- conf/app.src | 6 ------ conf/{php-fpm.conf => extra_php-fpm.conf} | 0 conf/nginx.conf | 5 ----- manifest.toml | 18 ++++++++++++------ scripts/install | 5 +++-- scripts/remove | 4 +++- scripts/upgrade | 9 +-------- 7 files changed, 19 insertions(+), 28 deletions(-) delete mode 100644 conf/app.src rename conf/{php-fpm.conf => extra_php-fpm.conf} (100%) diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 1420727..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS/archive/12.2.04.tar.gz -SOURCE_SUM=c56be62e6e6f7eabe57f4eea4e5d17d8538488ce28962135879074635f3151c3 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/php-fpm.conf b/conf/extra_php-fpm.conf similarity index 100% rename from conf/php-fpm.conf rename to conf/extra_php-fpm.conf diff --git a/conf/nginx.conf b/conf/nginx.conf index 0879d9f..84167e8 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __INSTALL_DIR__/; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file diff --git a/manifest.toml b/manifest.toml index 441b5fd..2e20250 100644 --- a/manifest.toml +++ b/manifest.toml @@ -2,8 +2,8 @@ packaging_format = 2 id = "zwiicms" name = "ZwiiCMS" -description.en = "Zwii - the simple, lightweight, database-free (Flat-File), scalable and responsive CMS!" -description.fr = "Zwii - le CMS simple, léger, sans base de données (Flat-File), modulable et responsive !" +description.en = "Simple, lightweight, database-free, scalable and responsive CMS" +description.fr = "CMS simple, léger, sans base de données, modulable et responsive" version = "12.2.04~ynh2" @@ -18,10 +18,10 @@ code = "https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS" fund = "https://ko-fi.com/T6T4FPG1A" [integration] -yunohost = ">= 11.1.6" +yunohost = ">= 11.1.15" architectures = "all" multi_instance = false -ldap = "not_relevant" +ldap = "not_relevant" sso = "not_relevant" disk = "50M" ram.build = "50M" @@ -55,10 +55,16 @@ ram.runtime = "50M" type = "password" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS/archive/12.2.04.tar.gz" + sha256 = "c56be62e6e6f7eabe57f4eea4e5d17d8538488ce28962135879074635f3151c3" + [resources.system_user] [resources.install_dir] - dir = "/var/www/__APP__" owner = "__APP__:rwx" group = "www-data:rx" @@ -66,4 +72,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php$YNH_DEFAULT_PHP_VERSION-mbstring,php$YNH_DEFAULT_PHP_VERSION-zip,php$YNH_DEFAULT_PHP_VERSION-GD,php$YNH_DEFAULT_PHP_VERSION-exif,php$YNH_DEFAULT_PHP_VERSION-XMLWriter" + packages = "php8.0-mbstring,php8.0-zip,php8.0-GD,php8.0-exif,php8.0-XMLWriter" diff --git a/scripts/install b/scripts/install index a342541..11ac1f0 100644 --- a/scripts/install +++ b/scripts/install @@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --time --weight= +ynh_script_progression --message="Setting up source files..." --weight= ynh_setup_source --dest_dir="$install_dir" @@ -28,7 +28,7 @@ find "$install_dir" -type d -exec chmod +s {} \; #================================================= ynh_script_progression --message="Adding system configurations related to $app ..." --weight=1 -ynh_add_fpm_config +ynh_add_fpm_config --usage=low --footprint=low ynh_add_nginx_config @@ -56,4 +56,5 @@ ynh_local_curl "${installUrl}" "csrf=${csrf}" "installId=${installId}" "installP #================================================= # END OF SCRIPT #================================================= + ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/remove b/scripts/remove index e4146ce..ffecbc2 100644 --- a/scripts/remove +++ b/scripts/remove @@ -9,10 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= +# REMOVE SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 ynh_remove_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index fd12c4f..db653a6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -11,13 +11,6 @@ source /usr/share/yunohost/helpers upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -#ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - #================================================= # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD, ETC...) #================================================= @@ -42,7 +35,7 @@ find "$install_dir" -type d -exec chmod +s {} \; #================================================= ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 -ynh_add_fpm_config +ynh_add_fpm_config --usage=low --footprint=low ynh_add_nginx_config From 9955fe27a10268605fbbfac05fb4f282f1ae2f42 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Mar 2023 09:54:35 +0100 Subject: [PATCH 2/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2e20250..a6e70e6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -60,7 +60,7 @@ ram.runtime = "50M" [resources.sources.main] url = "https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS/archive/12.2.04.tar.gz" - sha256 = "c56be62e6e6f7eabe57f4eea4e5d17d8538488ce28962135879074635f3151c3" + sha256 = "f39044334ece8ccbba1e8239ab84d7e9daee90cb758a1f9ece02627c6236f13e" [resources.system_user] From c63ff7170566465f8ef2a8b2503e5f8929adb1f5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Mar 2023 09:55:15 +0100 Subject: [PATCH 3/7] Update DESCRIPTION.md --- doc/DESCRIPTION.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 4848c85..ba866aa 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,16 +1,11 @@ -**Zwii is a database-less (flat-file) CMS that allows you to easily create and manage a web site without any programming knowledge.** - -> NOTE: Zwii is now available in multiple languages. +Zwii is a database-less (flat-file) CMS that allows you to easily create and manage a web site without any programming knowledge. ### Features -- Simple and complete - No Database -- In your image - Multi-users - Multilingual - 100% responsive - WYSIWYG editor - Files manager - Flexible -- Open source From 665e17660d1449fe5832d9545dda50ba61b38a1f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 19 Mar 2023 08:55:21 +0000 Subject: [PATCH 4/7] Auto-update README --- README.md | 7 +------ README_fr.md | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 281d145..bbdd473 100644 --- a/README.md +++ b/README.md @@ -16,22 +16,17 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -**Zwii is a database-less (flat-file) CMS that allows you to easily create and manage a web site without any programming knowledge.** - -> NOTE: Zwii is now available in multiple languages. +Zwii is a database-less (flat-file) CMS that allows you to easily create and manage a web site without any programming knowledge. ### Features -- Simple and complete - No Database -- In your image - Multi-users - Multilingual - 100% responsive - WYSIWYG editor - Files manager - Flexible -- Open source **Shipped version:** 12.2.04~ynh2 diff --git a/README_fr.md b/README_fr.md index 14457ef..bb303d5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,22 +16,17 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -**Zwii is a database-less (flat-file) CMS that allows you to easily create and manage a web site without any programming knowledge.** - -> NOTE: Zwii is now available in multiple languages. +Zwii is a database-less (flat-file) CMS that allows you to easily create and manage a web site without any programming knowledge. ### Features -- Simple and complete - No Database -- In your image - Multi-users - Multilingual - 100% responsive - WYSIWYG editor - Files manager - Flexible -- Open source **Version incluse :** 12.2.04~ynh2 From ff1d63766a97900a71c94e81aff8a21b9e7a7679 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Mar 2023 10:03:37 +0100 Subject: [PATCH 5/7] cleaning --- conf/extra_php-fpm.conf | 432 +--------------------------------------- conf/nginx.conf | 2 +- manifest.toml | 2 +- 3 files changed, 5 insertions(+), 431 deletions(-) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index f3a0486..017da9e 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -1,430 +1,4 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[__NAMETOCHANGE__] +; Additional php.ini defines, specific to this pool of workers. -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = __USER__ -group = __USER__ - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 10 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.0/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -slowlog = /var/log/nginx/__NAMETOCHANGE__.slow.log - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_slowlog_timeout = 5s - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_terminate_timeout = 1d - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = __INSTALL_DIR__ - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M - -; Common values to change to increase file upload limit -php_admin_value[upload_max_filesize] = 50M -php_admin_value[post_max_size] = 50M -; php_admin_flag[mail.add_x_header] = Off - -; Other common parameters -; php_admin_value[max_execution_time] = 600 -; php_admin_value[max_input_time] = 300 -; php_admin_value[memory_limit] = 256M -; php_admin_flag[short_open_tag] = On +php_admin_value[upload_max_filesize] = 256M +php_admin_value[post_max_size] = 256M diff --git a/conf/nginx.conf b/conf/nginx.conf index 84167e8..11e6835 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,7 +7,7 @@ location __PATH__/ { index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - #client_max_body_size 50M; + client_max_body_size 256M; try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { diff --git a/manifest.toml b/manifest.toml index a6e70e6..3fd8aa4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -24,7 +24,7 @@ multi_instance = false ldap = "not_relevant" sso = "not_relevant" disk = "50M" -ram.build = "50M" +ram.build = "800M" ram.runtime = "50M" [install] From 5725bce527891533e6e43626ee938db1409c4b94 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Mar 2023 10:06:52 +0100 Subject: [PATCH 6/7] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3fd8aa4..b3e0fcc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ZwiiCMS" description.en = "Simple, lightweight, database-free, scalable and responsive CMS" description.fr = "CMS simple, léger, sans base de données, modulable et responsive" -version = "12.2.04~ynh2" +version = "12.3.02~ynh1" maintainers = ["ewilly"] @@ -59,8 +59,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS/archive/12.2.04.tar.gz" - sha256 = "f39044334ece8ccbba1e8239ab84d7e9daee90cb758a1f9ece02627c6236f13e" + url = "https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS/archive/12.3.02.tar.gz" + sha256 = "aae0b732b7b58a0e1f9825c6302f275e6642b9f9406fe2cd5885c680cb9e1400" [resources.system_user] From ca5cae4c0c1002717a8688c6921b85e642e33838 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 19 Mar 2023 09:06:57 +0000 Subject: [PATCH 7/7] 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 bbdd473..680aef8 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Zwii is a database-less (flat-file) CMS that allows you to easily create and man - Flexible -**Shipped version:** 12.2.04~ynh2 +**Shipped version:** 12.3.02~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index bb303d5..ebb3b69 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ Zwii is a database-less (flat-file) CMS that allows you to easily create and man - Flexible -**Version incluse :** 12.2.04~ynh2 +**Version incluse :** 12.3.02~ynh1 ## Captures d’écran