From 50bcae5c6b44f438b8a986d929a4f441daf9dcb7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 27 Jul 2023 18:15:49 +0000 Subject: [PATCH 01/25] Auto-update README --- README.md | 6 +++--- README_fr.md | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 10bf4e9..e76e556 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Yellow for YunoHost -[![Integration level](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Working status](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Working status](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) + [![Install Yellow with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) *[Lire ce readme en français.](./README_fr.md)* @@ -17,8 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Content management system (CMS) for simple website -**Shipped version:** 0.8.20~ynh4 *(:warning: This is the `testing` branch. The [`master` branch](https://github.com/YunoHost-Apps/yellow_ynh/tree/master) used in the catalog is currently on version 0.8.20\~ynh3.)* - +**Shipped version:** 0.8.20~ynh4 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index adae12b..e44079e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,32 +5,32 @@ It shall NOT be edited by hand. # Yellow pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) + [![Installer Yellow avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Yellow rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Yellow rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Système de gestion de contenu (CMS) pour un site simple -**Version incluse :** 0.8.20~ynh4 *(:warning: Il s'agit de la branche `testing`. La [branche `master`](https://github.com/YunoHost-Apps/yellow_ynh/tree/master) utilisée dans le catalogue est actuellement en 0.8.20\~ynh3.)* - +**Version incluse :** 0.8.20~ynh4 **Démo :** https://datenstrom.se/yellow/demo/ -## Captures d'écran +## Captures d’écran -![Capture d'écran de Yellow](./doc/screenshots/datenstrom-yellow-en.png) +![Capture d’écran de Yellow](./doc/screenshots/datenstrom-yellow-en.png) ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -46,4 +46,4 @@ ou sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 20e9319bfd96e041a44d7d952ee6035520c27bb8 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 23 Sep 2023 15:39:44 +0200 Subject: [PATCH 02/25] Version 2 (#34) * v2 * v2 * cleaning * Auto-update README --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- check_process | 24 --- conf/app.src | 6 - conf/extra_php-fpm.conf | 4 + conf/nginx.conf | 2 +- conf/php-fpm.conf | 430 ---------------------------------------- doc/DESCRIPTION.md | 1 + manifest.json | 53 ----- manifest.toml | 57 ++++++ scripts/_common.sh | 4 - scripts/backup | 20 +- scripts/change_url | 84 +------- scripts/install | 84 +------- scripts/remove | 41 ---- scripts/restore | 57 +----- scripts/upgrade | 78 +------- tests.toml | 7 + 18 files changed, 83 insertions(+), 873 deletions(-) delete mode 100644 check_process delete mode 100644 conf/app.src create mode 100644 conf/extra_php-fpm.conf delete mode 100644 conf/php-fpm.conf create mode 100644 doc/DESCRIPTION.md delete mode 100644 manifest.json create mode 100644 manifest.toml create mode 100644 tests.toml diff --git a/README.md b/README.md index e76e556..5dea263 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Content management system (CMS) for simple website +Yellow is for people who make small websites **Shipped version:** 0.8.20~ynh4 diff --git a/README_fr.md b/README_fr.md index e44079e..4b8d340 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 -Système de gestion de contenu (CMS) pour un site simple +Yellow is for people who make small websites **Version incluse :** 0.8.20~ynh4 diff --git a/check_process b/check_process deleted file mode 100644 index 3a3ae8d..0000000 --- a/check_process +++ /dev/null @@ -1,24 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/yellow" - is_public=1 - ; 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=fb406ca10bf4af1d44b5fcecc4d6e54aee335fce - backup_restore=1 - multi_instance=1 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=fb406ca10bf4af1d44b5fcecc4d6e54aee335fce - name=Testing (#22) - manifest_arg=domain=DOMAIN&path=PATH&is_public=1& diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 4f63db3..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/datenstrom/yellow/archive/f9f60b8a949ad0820e032f84fde3faf873e0b2c6.zip -SOURCE_SUM=a6eaa696ecc9cc9c8ca7b6584ee49e586e268d5c324822e05502ea2f4b6a9576 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=yellow.zip diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf new file mode 100644 index 0000000..700c37c --- /dev/null +++ b/conf/extra_php-fpm.conf @@ -0,0 +1,4 @@ +; Additional php.ini defines, specific to this pool of workers. + +php_admin_value[upload_max_filesize] = 50M +php_admin_value[post_max_size] = 50M diff --git a/conf/nginx.conf b/conf/nginx.conf index e81f0ef..96bf29e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,7 +13,7 @@ location __PATH__/system { #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - alias __FINALPATH__/ ; + alias __INSTALL_DIR__/ ; index yellow.php; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index ab1a471..0000000 --- a/conf/php-fpm.conf +++ /dev/null @@ -1,430 +0,0 @@ -; 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__] - -; 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 = 5 - -; 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 = log/$pool.log.slow - -; 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 = 0 - -; 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 = __FINALPATH__ - -; 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 diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..8eb52e8 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Yellow is for people who make small websites \ No newline at end of file diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 58b5ce9..0000000 --- a/manifest.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "Yellow", - "id": "yellow", - "packaging_format": 1, - "description": { - "en": "Content management system (CMS) for simple website", - "fr": "Système de gestion de contenu (CMS) pour un site simple" - }, - "version": "0.8.20~ynh4", - "url": "https://datenstrom.se/yellow/", - "upstream": { - "license": "GPL-2.0-only", - "website": "https://datenstrom.se/yellow/", - "demo": "https://datenstrom.se/yellow/demo/", - "admindoc": "https://datenstrom.se/yellow/help/", - "code": "https://github.com/datenstrom/yellow/" - }, - "license": "GPL-2.0-only", - "maintainer": { - "name": "eric_G" - }, - "requirements": { - "yunohost": ">> 11.0.9" - }, - "multi_instance": true, - "services": [ - "nginx", - "php8.0-fpm" - ], - "arguments": { - "install" : [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/yellow", - "default": "/yellow" - }, - { - "name": "is_public", - "type": "boolean", - "help": { - "en": "If enabled, Yellow will be accessible by people who do not have an account. This can be changed later via the webadmin.", - "fr": "Si cette case est cochée, Yellow sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." - }, - "default": true - } - ] - } -} diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..86f12be --- /dev/null +++ b/manifest.toml @@ -0,0 +1,57 @@ +packaging_format = 2 + +id = "yellow" +name = "Yellow" +description.en = "Content management system (CMS) for simple website" +description.fr = "Système de gestion de contenu (CMS) pour un site simple" + +version = "0.8.20~ynh4" + +maintainers = ["eric_G"] + +[upstream] +license = "GPL-2.0-only" +website = "https://datenstrom.se/yellow/" +demo = "https://datenstrom.se/yellow/demo/" +admindoc = "https://datenstrom.se/yellow/help/" +code = "https://github.com/datenstrom/yellow/" + +[integration] +yunohost = ">= 11.2" +architectures = "all" +multi_instance = true +ldap = false +sso = false +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" + +[install] + [install.domain] + type = "domain" + + [install.path] + type = "path" + default = "/yellow" + + [install.init_main_permission] + type = "group" + default = "visitors" + +[resources] + [resources.sources.main] + url = "https://github.com/datenstrom/yellow/archive/f9f60b8a949ad0820e032f84fde3faf873e0b2c6.zip" + sha256 = "a6eaa696ecc9cc9c8ca7b6584ee49e586e268d5c324822e05502ea2f4b6a9576" + autoupdate.upstream = "https://github.com/datenstrom/yellow" + autoupdate.strategy = "latest_github_commit" + + [resources.system_user] + + [resources.install_dir] + + [resources.permissions] + main.url = "/" + + [resources.apt] + packages = "php8.2-mbstring, php8.2-xmlrpc, php8.2-sqlite3, php8.2-soap, php8.2-gd, php8.2-xml, php8.2-cli, php8.2-curl, php8.2-zip" + diff --git a/scripts/_common.sh b/scripts/_common.sh index f01d5fb..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,10 +4,6 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.0" - -pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xmlrpc php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index 886fc15..851d286 100644 --- a/scripts/backup +++ b/scripts/backup @@ -9,24 +9,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_print_info --message="Loading installation settings..." - -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) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= @@ -36,7 +18,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 e040461..124bf3a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,94 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH - -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -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) - -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -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 () { - # 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" - - # restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -change_domain=0 -if [ "$old_domain" != "$new_domain" ] -then - change_domain=1 -fi - -change_path=0 -if [ "$old_path" != "$new_path" ] -then - change_path=1 -fi - #================================================= # MODIFY URL IN NGINX CONF #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 -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" - # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" - # Create a dedicated NGINX config - 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 - # Store file checksum for the new config file location - 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 - -ynh_systemd_action --service_name=nginx --action=reload +ynh_change_url_nginx_config #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 739c128..7ef082d 100644 --- a/scripts/install +++ b/scripts/install @@ -9,71 +9,16 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -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 -phpversion=$YNH_PHP_VERSION - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= -ynh_script_progression --message="Validating installation parameters..." --weight=1 - -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die "This path already contains a folder" - -# Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -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=phpversion --value=$phpversion - -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing dependencies..." --weight=1 - -ynh_install_app_dependencies $pkg_dependencies - -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=2 - -# Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=7 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path # 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 -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION @@ -83,32 +28,9 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 - # Create a dedicated PHP-FPM config ynh_add_fpm_config -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 - -# Make app public if necessary or protect it -if [ $is_public -eq 1 ] -then - ynh_permission_update --permission="main" --add="visitors" -fi - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=2 - -ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index 56ac68c..61db822 100644 --- a/scripts/remove +++ b/scripts/remove @@ -9,24 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -app=$YNH_APP_INSTANCE_NAME - -domain=$(ynh_app_setting_get --app=$app --key=domain) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) - -#================================================= -# REMOVE APP MAIN DIR -#================================================= -ynh_script_progression --message="Removing app main directory..." --weight=2 - -# Remove the app directory securely -ynh_secure_remove --file="$final_path" - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -35,32 +17,9 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=3 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=1 - -# Delete a system user -ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 02d8c0d..398e614 100644 --- a/scripts/restore +++ b/scripts/restore @@ -9,61 +9,15 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -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) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=2 - -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " - -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -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" - #================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression --message="Restoring the app main directory..." --weight=2 -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" - -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 - -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -72,11 +26,6 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# 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" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ca40f59..781b2cd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,64 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -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) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - #================================================= # CHECK VERSION #================================================= upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=2 - -# If final_path doesn't exist, create it -if [ -z "$final_path" ]; then - final_path=/var/www/$app - ynh_app_setting_set --app=$app --key=final_path --value=$final_path -fi - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=3 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=2 - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -76,12 +24,11 @@ then ynh_script_progression --message="Upgrading source files..." --weight=2 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="content media system/extensions" + ynh_setup_source --dest_dir="$install_dir" --keep="content media system/extensions" fi -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION @@ -91,28 +38,9 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=1 - -ynh_install_app_dependencies $pkg_dependencies - -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 - # Create a dedicated php-fpm config ynh_add_fpm_config -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..91daf17 --- /dev/null +++ b/tests.toml @@ -0,0 +1,7 @@ +test_format = 1.0 + +[default] + + # ------------ + # Tests to run + # ------------ \ No newline at end of file From 89fd5ccddc0aed7f010711ead8cb589231714288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:01:42 +0200 Subject: [PATCH 03/25] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 86f12be..4f92b47 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "0.8.20~ynh4" +version = "0.8.20~ynh5" maintainers = ["eric_G"] From 577c2715d01f2bd31c02c3916f0f2506518ae789 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 23 Sep 2023 15:01:48 +0000 Subject: [PATCH 04/25] 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 5dea263..7b0a56b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 0.8.20~ynh4 +**Shipped version:** 0.8.20~ynh5 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 4b8d340..7f4f9a2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 0.8.20~ynh4 +**Version incluse :** 0.8.20~ynh5 **Démo :** https://datenstrom.se/yellow/demo/ From a688b1031b2d395fd6b4b7598bb3cd8d70658aea Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sat, 23 Sep 2023 22:10:32 +0200 Subject: [PATCH 05/25] Upgrade to v2023.09.23 (#36) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Upgrade to v2023.09.23 * Auto-update README * Update manifest.toml * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7b0a56b..fe8e78b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 0.8.20~ynh5 +**Shipped version:** 2023.09.23~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 7f4f9a2..451ed0e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 0.8.20~ynh5 +**Version incluse :** 2023.09.23~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index 4f92b47..36c9895 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "0.8.20~ynh5" +version = "2023.09.23~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/f9f60b8a949ad0820e032f84fde3faf873e0b2c6.zip" - sha256 = "a6eaa696ecc9cc9c8ca7b6584ee49e586e268d5c324822e05502ea2f4b6a9576" + url = "https://github.com/datenstrom/yellow/archive/28c6733c0f0fb3881544fa1be006a036f4cb4c74.tar.gz" + sha256 = "2103b87a52079b6217cb6efa91f0465f2cd446fba1465f0d968d8a4d7b85c824" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 441f3c483731502553bbbc19a50aa2dcd2a47114 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Wed, 4 Oct 2023 19:09:47 +0200 Subject: [PATCH 06/25] Upgrade to v2023.10.04 (#40) * Upgrade to v2023.10.04 * Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fe8e78b..0b14a08 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.09.23~ynh1 +**Shipped version:** 2023.10.04~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ @@ -31,7 +31,6 @@ Yellow is for people who make small websites * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 451ed0e..ff106af 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.09.23~ynh1 +**Version incluse :** 2023.10.04~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ @@ -31,7 +31,6 @@ Yellow is for people who make small websites * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs diff --git a/manifest.toml b/manifest.toml index 36c9895..e1738fa 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.09.23~ynh1" +version = "2023.10.04~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/28c6733c0f0fb3881544fa1be006a036f4cb4c74.tar.gz" - sha256 = "2103b87a52079b6217cb6efa91f0465f2cd446fba1465f0d968d8a4d7b85c824" + url = "https://github.com/datenstrom/yellow/archive/c6165f7f34d32665d5f5e84633bf3aaef3d1577c.tar.gz" + sha256 = "645c4042f074682c4277221907d1abb6772efcc2f02ab60c99e72488af82a1a7" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 1fa11d82e4f9c8926d67dc31c452efda6195bf66 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 9 Oct 2023 19:16:21 +0200 Subject: [PATCH 07/25] Upgrade to v2023.10.09 (#41) --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index e1738fa..4484e37 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.10.04~ynh1" +version = "2023.10.09~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/c6165f7f34d32665d5f5e84633bf3aaef3d1577c.tar.gz" - sha256 = "645c4042f074682c4277221907d1abb6772efcc2f02ab60c99e72488af82a1a7" + url = "https://github.com/datenstrom/yellow/archive/b0d1b96f3453b1a86f4740a44a6ce7f79b0f8559.tar.gz" + sha256 = "38748b057faea8fbc6aab7afd3967502c569c04b87529c250e8098d27b380505" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 1895da77ac75f96cfd0689879ebe150ccbc872f5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 9 Oct 2023 17:16:26 +0000 Subject: [PATCH 08/25] 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 0b14a08..70f85a1 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.10.04~ynh1 +**Shipped version:** 2023.10.09~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index ff106af..a2d07ee 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.10.04~ynh1 +**Version incluse :** 2023.10.09~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ From 7880d5840f23190e11bf8c0a0d3e4e0bf710778d Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 23 Oct 2023 12:16:43 +0200 Subject: [PATCH 09/25] Upgrade to v2023.10.23 (#43) * Upgrade to v2023.10.23 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 70f85a1..9dfbccb 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.10.09~ynh1 +**Shipped version:** 2023.10.23~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index a2d07ee..268009b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.10.09~ynh1 +**Version incluse :** 2023.10.23~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index 4484e37..acc1b54 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.10.09~ynh1" +version = "2023.10.23~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/b0d1b96f3453b1a86f4740a44a6ce7f79b0f8559.tar.gz" - sha256 = "38748b057faea8fbc6aab7afd3967502c569c04b87529c250e8098d27b380505" + url = "https://github.com/datenstrom/yellow/archive/4b8efd4ae2f8000d700e63095c7a413e2af5d3f1.tar.gz" + sha256 = "3d51f4076367ba07f85e704049c1e5ebb00ea785292bc9048bc8844ff94375d8" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From afc1d2ae54b8b3ca6e8fe9971261388e3f102936 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Tue, 24 Oct 2023 20:19:20 +0200 Subject: [PATCH 10/25] Upgrade to v2023.10.24 (#44) * Upgrade to v2023.10.24 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9dfbccb..146f438 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.10.23~ynh1 +**Shipped version:** 2023.10.24~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 268009b..4c299c4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.10.23~ynh1 +**Version incluse :** 2023.10.24~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index acc1b54..dcf7a41 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.10.23~ynh1" +version = "2023.10.24~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/4b8efd4ae2f8000d700e63095c7a413e2af5d3f1.tar.gz" - sha256 = "3d51f4076367ba07f85e704049c1e5ebb00ea785292bc9048bc8844ff94375d8" + url = "https://github.com/datenstrom/yellow/archive/8dc1d2961fa850b2cc43753be72eaca8e995deda.tar.gz" + sha256 = "d2802c3b8a65717184c9be4bc7e65f166d576f0294173c4d1ee45eb29bb002f1" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 177add82befb2d01410d6f4a6c211e826406a85a Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Thu, 26 Oct 2023 18:58:04 +0200 Subject: [PATCH 11/25] Upgrade to v2023.10.26 (#45) * Upgrade to v2023.10.26 * Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- manifest.toml | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 146f438..683f7e6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.10.24~ynh1 +**Shipped version:** 2023.10.26~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ @@ -31,6 +31,7 @@ Yellow is for people who make small websites * Official app website: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 4c299c4..51fb183 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.10.24~ynh1 +**Version incluse :** 2023.10.26~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ @@ -31,6 +31,7 @@ Yellow is for people who make small websites * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs diff --git a/manifest.toml b/manifest.toml index dcf7a41..8e8d410 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.10.24~ynh1" +version = "2023.10.26~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/8dc1d2961fa850b2cc43753be72eaca8e995deda.tar.gz" - sha256 = "d2802c3b8a65717184c9be4bc7e65f166d576f0294173c4d1ee45eb29bb002f1" + url = "https://github.com/datenstrom/yellow/archive/8bbb46ddda8a8c62bac4bdf1f1b063a288046daa.tar.gz" + sha256 = "ce5c3307833f778866cab5bfae21099b8144e4f8488245491031f1177e9b768e" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 708e1e5e8e84a5b41b383cff0cd32005e9b1fc15 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Fri, 27 Oct 2023 23:28:35 +0200 Subject: [PATCH 12/25] Upgrade to v2023.10.27 (#46) --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8e8d410..198e98f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.10.26~ynh1" +version = "2023.10.27~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/8bbb46ddda8a8c62bac4bdf1f1b063a288046daa.tar.gz" - sha256 = "ce5c3307833f778866cab5bfae21099b8144e4f8488245491031f1177e9b768e" + url = "https://github.com/datenstrom/yellow/archive/bd4b59f874fd74e48ecc57764d9df850836e2bfb.tar.gz" + sha256 = "4529f4425ec236361e972cc317bd84fa90eef554711210de9a560b297fbe6c66" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From e99bf6388565acf1069e476fade72cd12438ffb3 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Thu, 2 Nov 2023 15:23:21 +0100 Subject: [PATCH 13/25] Upgrade to v2023.11.01 (#47) * Upgrade to v2023.11.01 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 683f7e6..1bba8a9 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.10.26~ynh1 +**Shipped version:** 2023.11.01~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 51fb183..08c1241 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.10.26~ynh1 +**Version incluse :** 2023.11.01~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index 198e98f..fb90170 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.10.27~ynh1" +version = "2023.11.01~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/bd4b59f874fd74e48ecc57764d9df850836e2bfb.tar.gz" - sha256 = "4529f4425ec236361e972cc317bd84fa90eef554711210de9a560b297fbe6c66" + url = "https://github.com/datenstrom/yellow/archive/f0f686ee64b7c98993e2fbe8bc5c69d13c3f860f.tar.gz" + sha256 = "3d80f1f903ca448645f4a8f04beb5353072434055273ef4c36182d8f0d9867b0" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 3adbccbe1407cacb420a2f5bd9e9f49c518ef601 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sat, 11 Nov 2023 12:51:24 +0100 Subject: [PATCH 14/25] Upgrade to v2023.11.10 (#49) * Upgrade to v2023.11.10 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1bba8a9..d701adf 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.11.01~ynh1 +**Shipped version:** 2023.11.10~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 08c1241..ba1954e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.11.01~ynh1 +**Version incluse :** 2023.11.10~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index fb90170..45806c4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.11.01~ynh1" +version = "2023.11.10~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/f0f686ee64b7c98993e2fbe8bc5c69d13c3f860f.tar.gz" - sha256 = "3d80f1f903ca448645f4a8f04beb5353072434055273ef4c36182d8f0d9867b0" + url = "https://github.com/datenstrom/yellow/archive/531e9a247b0d29a1f4d335376c7bb3b05debe01d.tar.gz" + sha256 = "1cf80ab72e79bb3d08cda03c18d143ba9b01bbb104a376b2b358c9f2472c4256" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 3a98b16bb77dc98dd720edec8ce3c4944f7d7358 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Wed, 15 Nov 2023 09:29:47 +0100 Subject: [PATCH 15/25] Upgrade to v2023.11.14 (#50) * Upgrade to v2023.11.14 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d701adf..8783744 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.11.10~ynh1 +**Shipped version:** 2023.11.14~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index ba1954e..52b2aaf 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.11.10~ynh1 +**Version incluse :** 2023.11.14~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index 45806c4..b03cd1a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.11.10~ynh1" +version = "2023.11.14~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/531e9a247b0d29a1f4d335376c7bb3b05debe01d.tar.gz" - sha256 = "1cf80ab72e79bb3d08cda03c18d143ba9b01bbb104a376b2b358c9f2472c4256" + url = "https://github.com/datenstrom/yellow/archive/538ff5c92f7cd282eb944cb9dfb6f82178a0b426.tar.gz" + sha256 = "a9f4d180cb07bcf0f445f7453ce8de994fec028804156a59a8df28b38006c4cb" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 43647f2ed44dbb1a394c8714fb74ad4f3806e3f9 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Thu, 16 Nov 2023 18:43:18 +0100 Subject: [PATCH 16/25] Upgrade to v2023.11.16 (#52) * Upgrade to v2023.11.16 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8783744..01eb18d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.11.14~ynh1 +**Shipped version:** 2023.11.16~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 52b2aaf..2de52ea 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.11.14~ynh1 +**Version incluse :** 2023.11.16~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index b03cd1a..457c721 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.11.14~ynh1" +version = "2023.11.16~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/538ff5c92f7cd282eb944cb9dfb6f82178a0b426.tar.gz" - sha256 = "a9f4d180cb07bcf0f445f7453ce8de994fec028804156a59a8df28b38006c4cb" + url = "https://github.com/datenstrom/yellow/archive/edcef7ebf66562bcd0eff5812788269076166a8e.tar.gz" + sha256 = "13e3f983325f6d3a22763a040a03548da1ac3813d89fdbc12b840d254689143c" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From f71fa4ae4ef920d3617b19efbfaae3e7efd017d2 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Tue, 21 Nov 2023 09:08:56 +0100 Subject: [PATCH 17/25] Upgrade to v2023.11.20 (#53) * Upgrade to v2023.11.20 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 01eb18d..1f8ae9c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.11.16~ynh1 +**Shipped version:** 2023.11.20~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 2de52ea..37d0652 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.11.16~ynh1 +**Version incluse :** 2023.11.20~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index 457c721..e450d97 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.11.16~ynh1" +version = "2023.11.20~ynh1" maintainers = ["eric_G"] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/edcef7ebf66562bcd0eff5812788269076166a8e.tar.gz" - sha256 = "13e3f983325f6d3a22763a040a03548da1ac3813d89fdbc12b840d254689143c" + url = "https://github.com/datenstrom/yellow/archive/721424bbe82463ca8cceab730d0ce0bfd50f24bd.tar.gz" + sha256 = "7fe029b79d0a5bad1a412645bb4ef445c88283044e8b053a6d5d9eea224b31ad" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From a2013bd4ef6bc7481bf09b01db6e068f666330dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Nov 2023 09:47:20 +0100 Subject: [PATCH 18/25] cleaning --- manifest.toml | 3 +++ scripts/install | 4 ++-- scripts/remove | 4 ++-- scripts/restore | 4 +++- scripts/upgrade | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/manifest.toml b/manifest.toml index e450d97..74d970b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,8 +20,11 @@ code = "https://github.com/datenstrom/yellow/" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" diff --git a/scripts/install b/scripts/install index 7ef082d..5be4c19 100644 --- a/scripts/install +++ b/scripts/install @@ -21,9 +21,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index 61db822..5b17c2d 100644 --- a/scripts/remove +++ b/scripts/remove @@ -10,9 +10,9 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index 398e614..a1e8f97 100644 --- a/scripts/restore +++ b/scripts/restore @@ -19,10 +19,12 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE SYSTEM CONFIGURATIONS #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 781b2cd..7217840 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -31,9 +31,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# NGINX CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config From f93ce24b39834b24cfa24da3ca0c0da8492cd9b8 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Fri, 24 Nov 2023 12:17:06 +0100 Subject: [PATCH 19/25] Upgrade to v2023.11.23 (#55) * Upgrade to v2023.11.23 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1f8ae9c..a9898aa 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.11.20~ynh1 +**Shipped version:** 2023.11.23~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 37d0652..6eda118 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.11.20~ynh1 +**Version incluse :** 2023.11.23~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index 74d970b..0366b5a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.11.20~ynh1" +version = "2023.11.23~ynh1" maintainers = ["eric_G"] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/721424bbe82463ca8cceab730d0ce0bfd50f24bd.tar.gz" - sha256 = "7fe029b79d0a5bad1a412645bb4ef445c88283044e8b053a6d5d9eea224b31ad" + url = "https://github.com/datenstrom/yellow/archive/9fce7f19fccf168e525a3af653486ac6b08c198a.tar.gz" + sha256 = "ef44238ac2cb342a73d668f09f2fbe6fc37f85b9541d9abb206ee718ee9b41e3" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 33f80e26cc04cd91522b71b0a6ad75303ca88e3f Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Fri, 22 Dec 2023 19:13:08 +0100 Subject: [PATCH 20/25] Upgrade to v2023.12.22 (#68) * Upgrade to v2023.12.22 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a9898aa..9178c02 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.11.23~ynh1 +**Shipped version:** 2023.12.22~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 6eda118..e2d7a37 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.11.23~ynh1 +**Version incluse :** 2023.12.22~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index 0366b5a..fadd047 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.11.23~ynh1" +version = "2023.12.22~ynh1" maintainers = ["eric_G"] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/9fce7f19fccf168e525a3af653486ac6b08c198a.tar.gz" - sha256 = "ef44238ac2cb342a73d668f09f2fbe6fc37f85b9541d9abb206ee718ee9b41e3" + url = "https://github.com/datenstrom/yellow/archive/d87fabae53ed451b9efd9982ee5ea800a2b2d487.tar.gz" + sha256 = "fd7f0a8a5ae45a94e2bebb76ef3938358911865e4ad851e9e76e92695158b4e0" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From d7fc9ba80703c641e6f5a9747784d238f6ecd274 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sat, 23 Dec 2023 19:27:26 +0100 Subject: [PATCH 21/25] Upgrade to v2023.12.23 (#69) * Upgrade to v2023.12.23 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9178c02..f23f289 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.12.22~ynh1 +**Shipped version:** 2023.12.23~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index e2d7a37..73e75f6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.12.22~ynh1 +**Version incluse :** 2023.12.23~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index fadd047..13cec5a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.12.22~ynh1" +version = "2023.12.23~ynh1" maintainers = ["eric_G"] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/d87fabae53ed451b9efd9982ee5ea800a2b2d487.tar.gz" - sha256 = "fd7f0a8a5ae45a94e2bebb76ef3938358911865e4ad851e9e76e92695158b4e0" + url = "https://github.com/datenstrom/yellow/archive/f47dddbb742162c902ea765ff12bf94da800e1d7.tar.gz" + sha256 = "f944966f526ab0e7d8cd1b57c4327d72e67ef1525cd5ccee4e8f5ae8f35bb573" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From d84cb768580058bc413dd179c64240a84325ac52 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 7 Jan 2024 05:18:45 +0100 Subject: [PATCH 22/25] Upgrade to v2024.01.06 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 13cec5a..f9265d4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.12.23~ynh1" +version = "2024.01.06~ynh1" maintainers = ["eric_G"] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/f47dddbb742162c902ea765ff12bf94da800e1d7.tar.gz" - sha256 = "f944966f526ab0e7d8cd1b57c4327d72e67ef1525cd5ccee4e8f5ae8f35bb573" + url = "https://github.com/datenstrom/yellow/archive/4c68bcc9bf52d602562ecb87761f9ad3d994ecbd.tar.gz" + sha256 = "822f74e0b5aaffd7a609876c7140a69ab4c4b98c668df18ec8f6ca2c2367cdbb" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 776a123281987029d4a2f81eaab1282726f65353 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 7 Jan 2024 04:18:51 +0000 Subject: [PATCH 23/25] 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 f23f289..db932e5 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.12.23~ynh1 +**Shipped version:** 2024.01.06~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 73e75f6..edc680a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.12.23~ynh1 +**Version incluse :** 2024.01.06~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ From cc737ab467557d6e951d99de4e05f0d2343a66a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 14 Feb 2024 17:34:52 +0100 Subject: [PATCH 24/25] Stepping down as maintainer --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 13cec5a..a773473 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Système de gestion de contenu (CMS) pour un site simple" version = "2023.12.23~ynh1" -maintainers = ["eric_G"] +maintainers = [] [upstream] license = "GPL-2.0-only" From 0b7a32dbc018bdc595634f6fb50264adf20844fa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 15 Feb 2024 22:11:07 +0000 Subject: [PATCH 25/25] Auto-update README --- README.md | 4 ++-- README_fr.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index db932e5..4ff1243 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -46,4 +46,4 @@ or sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index edc680a..9298832 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@