From 580132c86136c00c318460c8fec9564d25251975 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 5 Nov 2021 23:50:34 +0700 Subject: [PATCH 001/104] First commit First try for MinIO app --- README.md | 84 +-------- README_fr.md | 69 +------ conf/.env | 4 + conf/app.src | 12 +- conf/nginx.conf | 38 ++-- conf/php-fpm.conf | 430 ------------------------------------------- conf/systemd.service | 4 +- manifest.json | 32 +--- scripts/_common.sh | 1 - scripts/install | 83 +++------ 10 files changed, 63 insertions(+), 694 deletions(-) create mode 100644 conf/.env delete mode 100644 conf/php-fpm.conf diff --git a/README.md b/README.md index 565d57e..ea9fa12 100644 --- a/README.md +++ b/README.md @@ -1,83 +1 @@ -# Packaging your an app, starting from this example - -- Copy this app before working on it, using the ['Use this template'](https://github.com/YunoHost/example_ynh/generate) button on the Github repo. -- Edit the `manifest.json` with app specific info. -- Edit the `install`, `upgrade`, `remove`, `backup`, and `restore` scripts, and any relevant conf files in `conf/`. - - Using the [script helpers documentation.](https://yunohost.org/packaging_apps_helpers) -- Add a `LICENSE` file for the package. -- Edit `doc/DISCLAIMER*.md` -- The `README.md` files are to be automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator - ---- - - -# Example app for YunoHost - -[![Integration level](https://dash.yunohost.org/integration/example.svg)](https://dash.yunohost.org/appci/app/example) ![](https://ci-apps.yunohost.org/ci/badges/example.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/example.maintain.svg) -[![Install Example app with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=example) - -*[Lire ce readme en français.](./README_fr.md)* - -> *This package allows you to install Example app quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* - -## Overview - -Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. - -### Features - -- Ut enim ad minim veniam, quis nostrud exercitation ullamco ; -- Laboris nisi ut aliquip ex ea commodo consequat ; -- Duis aute irure dolor in reprehenderit in voluptate ; -- Velit esse cillum dolore eu fugiat nulla pariatur ; -- Excepteur sint occaecat cupidatat non proident, sunt in culpa." - - -**Shipped version:** 1.0~ynh1 - -**Demo:** https://demo.example.com - -## Screenshots - -![](./doc/screenshots/example.jpg) - -## Disclaimers / important information - -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * requiring a full dedicated domain ? - * architectures not supported ? - * not-working single-sign on or LDAP integration ? - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... - -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? - -## Documentation and resources - -* Official app website: https://example.com -* Official user documentation: https://yunohost.org/apps -* Official admin documentation: https://yunohost.org/packaging_apps -* Upstream app code repository: https://some.forge.com/example/example -* YunoHost documentation for this app: https://yunohost.org/app_example -* Report a bug: https://github.com/YunoHost-Apps/example_ynh/issues - -## Developer info - -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/example_ynh/tree/testing). - -To try the testing branch, please proceed like that. -``` -sudo yunohost app install https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug -or -sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug -``` - -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +### MinIO server diff --git a/README_fr.md b/README_fr.md index c89de4d..74c4949 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,68 +1 @@ -# Example app pour YunoHost - -[![Niveau d'intégration](https://dash.yunohost.org/integration/example.svg)](https://dash.yunohost.org/appci/app/example) ![](https://ci-apps.yunohost.org/ci/badges/example.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/example.maintain.svg) -[![Installer Example app avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=example) - -*[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* - -> *Ce package vous permet d'installer Example app 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 - -Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. - -### Features - -- Ut enim ad minim veniam, quis nostrud exercitation ullamco ; -- Laboris nisi ut aliquip ex ea commodo consequat ; -- Duis aute irure dolor in reprehenderit in voluptate ; -- Velit esse cillum dolore eu fugiat nulla pariatur ; -- Excepteur sint occaecat cupidatat non proident, sunt in culpa." - - -**Version incluse :** 1.0~ynh1 - -**Démo :** https://demo.example.com - -## Captures d'écran - -![](./doc/screenshots/example.jpg) - -## Avertissements / informations importantes - -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * requiring a full dedicated domain ? - * architectures not supported ? - * not-working single-sign on or LDAP integration ? - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... - -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? - -## Documentations et ressources - -* Site officiel de l'app : https://example.com -* Documentation officielle utilisateur : https://yunohost.org/apps -* Documentation officielle de l'admin : https://yunohost.org/packaging_apps -* Dépôt de code officiel de l'app : https://some.forge.com/example/example -* Documentation YunoHost pour cette app : https://yunohost.org/app_example -* Signaler un bug : https://github.com/YunoHost-Apps/example_ynh/issues - -## Informations pour les développeurs - -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/example_ynh/tree/testing). - -Pour essayer la branche testing, procédez comme suit. -``` -sudo yunohost app install https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug -ou -sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug -``` - -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +### Serveur MinIO \ No newline at end of file diff --git a/conf/.env b/conf/.env new file mode 100644 index 0000000..3c61e0d --- /dev/null +++ b/conf/.env @@ -0,0 +1,4 @@ +MINIO_ROOT_USER="minio" +MINIO_VOLUMES="__DATADIR__/" +MINIO_OPTS="-C __FINAL_PATH__/ --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" +MINIO_ROOT_PASSWORD="miniostorage" \ No newline at end of file diff --git a/conf/app.src b/conf/app.src index 17489bf..4f20ee7 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=url of app's source -SOURCE_SUM=sha256 checksum +SOURCE_URL=https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2021-11-05T09-16-26Z +SOURCE_SUM=6398ef9107d248cc25e4f21aa36d582b5bf74d9b1c671fa79c81c1f4f607531f SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true +SOURCE_FORMAT= +SOURCE_IN_SUBDIR=false +SOURCE_FILENAME=mc +SOURCE_EXTRACT=false diff --git a/conf/nginx.conf b/conf/nginx.conf index 37de41d..2a94e6a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,33 +1,19 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { - - # Path to source - alias __FINALPATH__/ ; +location / { # Force usage of https if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } -### Example PHP configuration (remove it if not used) - index index.php; - - # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - #client_max_body_size 50M; - - try_files $uri $uri/ index.php; - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; - - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -### End of PHP configuration part - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; + proxy_pass http://127.0.0.1:__PORT__; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; } 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/conf/systemd.service b/conf/systemd.service index 31e9da3..b77ad7e 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Small description of the service +Description=A High Performance, Kubernetes Native Object Storage After=network.target [Service] @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ -ExecStart=__FINALPATH__/script +ExecStart=__FINALPATH__/minio StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit diff --git a/manifest.json b/manifest.json index 17fe090..d4080b9 100644 --- a/manifest.json +++ b/manifest.json @@ -1,13 +1,13 @@ { - "name": "Example app", - "id": "example", + "name": "MinIO server", + "id": "minio", "packaging_format": 1, "description": { - "en": "Explain in *a few (10~15) words* the purpose of the app or what it actually does (it is meant to give a rough idea to users browsing a catalog of 100+ apps)", - "fr": "Expliquez en *quelques* (10~15) mots l'utilité de l'app ou ce qu'elle fait (l'objectif est de donner une idée grossière pour des utilisateurs qui naviguent dans un catalogue de 100+ apps)" + "en": "MinIO is a High Performance, Kubernetes Native Object Storage", + "fr": "MinIO est un serveur de stockage d'objets hautes performances" }, - "version": "1.0~ynh1", - "url": "https://example.com", + "version": "RELEASE.2021-11-05T09-16-26Z~ynh1", + "url": "https://min.io/", "upstream": { "license": "free", "website": "https://example.com", @@ -24,11 +24,9 @@ "requirements": { "yunohost": ">= 4.1.3" }, - "multi_instance": true, + "multi_instance": false, "services": [ - "nginx", - "php7.3-fpm", - "mysql" + "nginx" ], "arguments": { "install" : [ @@ -40,11 +38,7 @@ "name": "path", "type": "path", "example": "/example", - "default": "/example" - }, - { - "name": "admin", - "type": "user" + "default": "/minio" }, { "name": "is_public", @@ -60,14 +54,6 @@ }, "choices": ["fr", "en"], "default": "fr" - }, - { - "name": "password", - "type": "password", - "help": { - "en": "Use the help field to add an information for the admin about this question.", - "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question." - } } ] } diff --git a/scripts/_common.sh b/scripts/_common.sh index 7e55ac0..94c90e8 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,6 @@ #================================================= # dependencies used by the app -pkg_dependencies="deb1 deb2 php$YNH_DEFAULT_PHP_VERSION-deb1 php$YNH_DEFAULT_PHP_VERSION-deb2" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 231876a..54b0fd5 100755 --- a/scripts/install +++ b/scripts/install @@ -26,10 +26,9 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH -admin=$YNH_APP_ARG_ADMIN +#admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE -password=$YNH_APP_ARG_PASSWORD ### If it's a multi-instance app, meaning it can be installed several times independently ### The id of the app as stated in the manifest is available as $YNH_APP_ID @@ -58,12 +57,15 @@ ynh_script_progression --message="Validating installation parameters..." --time ### If the app uses NGINX as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app". ### If the app provides an internal web server (or uses another application server such as uWSGI), the final path should be "/opt/yunohost/$app" -final_path=/var/www/$app +final_path=/opt/yunohost/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +data_path=/home/yunohost.app/$app +test ! -e "$data_path" || ynh_die --message="This path already contains a folder" + #================================================= # STORE SETTINGS FROM MANIFEST #================================================= @@ -71,7 +73,7 @@ ynh_script_progression --message="Storing installation settings..." --time --wei ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=admin --value=$admin +#ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=language --value=$language #================================================= @@ -87,9 +89,13 @@ ynh_script_progression --message="Finding an available port..." --time --weight= ### - Remove the section "CLOSE A PORT" in the remove script # Find an available port -port=$(ynh_find_port --port=8095) +port=$(ynh_find_port --port=9000) ynh_app_setting_set --app=$app --key=port --value=$port +# Find an available port for minio-console +console_port=$(ynh_find_port --port=36669) +ynh_app_setting_set --app=$app --key=console_port --value=$console_port + # Optional: Expose this port publicly # (N.B.: you only need to do this if the app actually needs to expose the port publicly. # If you do this and the app doesn't actually need you are CREATING SECURITY HOLES IN THE SERVER !) @@ -121,25 +127,6 @@ ynh_script_progression --message="Configuring system user..." --time --weight=1 # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" -#================================================= -# CREATE A MYSQL DATABASE -#================================================= -ynh_script_progression --message="Creating a MySQL database..." --time --weight=1 - -### Use these lines if you need a database for the application. -### `ynh_mysql_setup_db` will create a database, an associated user and a ramdom password. -### The password will be stored as 'mysqlpwd' into the app settings, -### and will be available as $db_pwd -### If you're not using these lines: -### - Remove the section "BACKUP THE MYSQL DATABASE" in the backup script -### - Remove also the section "REMOVE THE MYSQL DATABASE" in the remove script -### - As well as the section "RESTORE THE MYSQL DATABASE" in the restore script - -db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name -ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -151,7 +138,7 @@ ynh_script_progression --message="Setting up source files..." --time --weight=1 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="$final_path" --source_id=minio # FIXME: this should be managed by the core in the future # Here, as a packager, you may have to tweak the ownerhsip/permissions @@ -173,25 +160,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --time --weig # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --time --weight=1 - -### `ynh_add_fpm_config` is used to set up a PHP config. -### You can remove it if your app doesn't use PHP. -### `ynh_add_fpm_config` will use the files conf/php-fpm.conf -### If you're not using these lines: -### - You can remove these files in conf/. -### - Remove the section "BACKUP THE PHP-FPM CONFIGURATION" in the backup script -### - Remove also the section "REMOVE PHP-FPM CONFIGURATION" in the remove script -### - As well as the section "RESTORE THE PHP-FPM CONFIGURATION" in the restore script -### with the reload at the end of the script. -### - And the section "PHP-FPM CONFIGURATION" in the upgrade script - -# Create a dedicated PHP-FPM config -ynh_add_fpm_config - #================================================= # SPECIFIC SETUP #================================================= @@ -230,6 +198,11 @@ chown -R $app:www-data "$datadir" #================================================= ynh_script_progression --message="Adding a configuration file..." --time --weight=1 +ynh_add_config --template="../conf/.env" --destination="$final_path/.env" + +chmod 400 "$final_path/.env" +chown $app:$app "$final_path/.env" + ### You can add specific configuration files. ### ### Typically, put your template conf file in ../conf/your_config_file @@ -242,13 +215,13 @@ ynh_script_progression --message="Adding a configuration file..." --time --weigh ### ### Check the documentation of `ynh_add_config` for more info. -ynh_add_config --template="some_config_file" --destination="$final_path/some_config_file" +#ynh_add_config --template="some_config_file" --destination="$final_path/some_config_file" # FIXME: this should be handled by the core in the future # You may need to use chmod 600 instead of 400, # for example if the app is expected to be able to modify its own config -chmod 400 "$final_path/some_config_file" -chown $app:$app "$final_path/some_config_file" +#chmod 400 "$final_path/some_config_file" +#chown $app:$app "$final_path/some_config_file" ### For more complex cases where you want to replace stuff using regexes, ### you shoud rely on ynh_replace_string (which is basically a wrapper for sed) @@ -286,16 +259,16 @@ ynh_add_systemd_config ### forms. # Set the app as temporarily public for curl call -ynh_script_progression --message="Configuring SSOwat..." --time --weight=1 +#ynh_script_progression --message="Configuring SSOwat..." --time --weight=1 # Making the app public for curl -ynh_permission_update --permission="main" --add="visitors" +#ynh_permission_update --permission="main" --add="visitors" # Installation with curl -ynh_script_progression --message="Finalizing installation..." --time --weight=1 -ynh_local_curl "/INSTALL_PATH" "key1=value1" "key2=value2" "key3=value3" +#ynh_script_progression --message="Finalizing installation..." --time --weight=1 +#ynh_local_curl "/INSTALL_PATH" "key1=value1" "key2=value2" "key3=value3" # Remove the public access -ynh_permission_update --permission="main" --remove="visitors" +#ynh_permission_update --permission="main" --remove="visitors" #================================================= # GENERIC FINALIZATION @@ -329,7 +302,7 @@ ynh_script_progression --message="Integrating service in YunoHost..." --time --w ### - As well as the section "INTEGRATE SERVICE IN YUNOHOST" in the restore script ### - And the section "INTEGRATE SERVICE IN YUNOHOST" in the upgrade script -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="A High Performance, Kubernetes Native Object Storage" --log="/var/log/$app/$app.log" ### Additional options starting with 3.8: ### @@ -388,12 +361,12 @@ fi ### does have for example an admin interface or an API. # Only the admin can access the admin panel of the app (if the app has an admin panel) -ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin +#ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin # Everyone can access the API part # We don't want to display the tile in the SSO so we put --show_tile="false" # And we don't want the YunoHost admin to be able to remove visitors group to this permission, so we put --protected="true" -ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" +#ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" #================================================= # RELOAD NGINX From 75937371b2d5ff5873b5dd9b3129ebc2da5b0cd7 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 5 Nov 2021 23:55:45 +0700 Subject: [PATCH 002/104] Update remove --- scripts/remove | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/scripts/remove b/scripts/remove index d53be6d..79b9812 100755 --- a/scripts/remove +++ b/scripts/remove @@ -18,9 +18,9 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name +console_port=$(ynh_app_setting_get --app=$app --key=console_port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +datadir==$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # STANDARD REMOVE @@ -51,14 +51,6 @@ ynh_script_progression --message="Removing logrotate configuration..." --time -- # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# REMOVE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Removing the MySQL database..." --time --weight=1 - -# Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name - #================================================= # REMOVE DEPENDENCIES #================================================= @@ -74,6 +66,7 @@ ynh_script_progression --message="Removing app main directory..." --time --weigh # Remove the app directory securely ynh_secure_remove --file="$final_path" +ynh_secure_remove --file="$datadir" #================================================= # REMOVE NGINX CONFIGURATION @@ -101,6 +94,12 @@ then ynh_exec_warn_less yunohost firewall disallow TCP $port fi +if yunohost firewall list | grep -q "\- $console_port$" +then + ynh_script_progression --message="Closing port $console_port..." --time --weight=1 + ynh_exec_warn_less yunohost firewall disallow TCP $port +fi + #================================================= # REMOVE FAIL2BAN CONFIGURATION #================================================= From d011a379653bc78a77adb2e964382677ed83af78 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 00:00:51 +0700 Subject: [PATCH 003/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 54b0fd5..f1f67ac 100755 --- a/scripts/install +++ b/scripts/install @@ -117,7 +117,7 @@ ynh_script_progression --message="Installing dependencies..." --time --weight=1 ### - As well as the section "REINSTALL DEPENDENCIES" in the restore script ### - And the section "UPGRADE DEPENDENCIES" in the upgrade script -ynh_install_app_dependencies $pkg_dependencies +#ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER From 2a4e4cfe02ae43fbc603a586f38550316ded5423 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 00:16:30 +0700 Subject: [PATCH 004/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index f1f67ac..76824a5 100755 --- a/scripts/install +++ b/scripts/install @@ -138,7 +138,7 @@ ynh_script_progression --message="Setting up source files..." --time --weight=1 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" --source_id=minio +ynh_setup_source --dest_dir="$final_path" # FIXME: this should be managed by the core in the future # Here, as a packager, you may have to tweak the ownerhsip/permissions From 777d5f66b374a4f5a9d0c22d094372024b7eaea2 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 00:25:32 +0700 Subject: [PATCH 005/104] Updates --- scripts/install | 2 +- scripts/remove | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index 76824a5..57513d5 100755 --- a/scripts/install +++ b/scripts/install @@ -342,7 +342,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap ynh_script_progression --message="Configuring Fail2Ban..." --time --weight=1 # Create a dedicated Fail2Ban config -ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login" +ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index 79b9812..c9316e0 100755 --- a/scripts/remove +++ b/scripts/remove @@ -76,14 +76,6 @@ 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..." --time --weight=1 - -# Remove the dedicated PHP-FPM config -ynh_remove_fpm_config - #================================================= # CLOSE A PORT #================================================= From 20987733101cb8e89aecec1bbce2cecc7d64454f Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 00:30:33 +0700 Subject: [PATCH 006/104] Update app.src --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index 4f20ee7..ab0fe4f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,5 +3,5 @@ SOURCE_SUM=6398ef9107d248cc25e4f21aa36d582b5bf74d9b1c671fa79c81c1f4f607531f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT= SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=mc +SOURCE_FILENAME=minio SOURCE_EXTRACT=false From 7fc3b75f7c8919b24f7e6cd4614cc2563f64c4ae Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 00:32:45 +0700 Subject: [PATCH 007/104] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 57513d5..f970816 100755 --- a/scripts/install +++ b/scripts/install @@ -339,10 +339,10 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap #================================================= # SETUP FAIL2BAN #================================================= -ynh_script_progression --message="Configuring Fail2Ban..." --time --weight=1 +#ynh_script_progression --message="Configuring Fail2Ban..." --time --weight=1 # Create a dedicated Fail2Ban config -ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" +#ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" #================================================= # SETUP SSOWAT From 5b92ffdd03eeaf5e25d21d562b921215521522a8 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 00:43:46 +0700 Subject: [PATCH 008/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index f970816..4a1c2f9 100755 --- a/scripts/install +++ b/scripts/install @@ -146,7 +146,7 @@ ynh_setup_source --dest_dir="$final_path" # files in some cases. # But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder - # this will be treated as a security issue. -chmod 750 "$final_path" +chmod -R 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" From 444b06230c3953d1e4a5ce86928106192419529f Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 00:45:36 +0700 Subject: [PATCH 009/104] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index b77ad7e..76de538 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ -ExecStart=__FINALPATH__/minio +ExecStart=__FINALPATH__/minio $MINIO_OPTS $MINIO_VOLUMES StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit From fb4dfc447e0d35366d91b618f9983d2c44826edd Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 00:48:04 +0700 Subject: [PATCH 010/104] Update nginx.conf --- conf/nginx.conf | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 2a94e6a..d211b3d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location / { +location /server { # Force usage of https if ($scheme = http) { @@ -17,3 +17,23 @@ location / { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; } + +location /console { + + # Force usage of https + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + + proxy_pass http://127.0.0.1:__CONSOLE_PORT__; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; +} \ No newline at end of file From de6d845c2737a35c77a49667ee7fbd7a8cae8000 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 00:51:33 +0700 Subject: [PATCH 011/104] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 76de538..7fa6cba 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ -ExecStart=__FINALPATH__/minio $MINIO_OPTS $MINIO_VOLUMES +ExecStart=__FINALPATH__/minio server $MINIO_OPTS $MINIO_VOLUMES StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit From bd852c0c5b8a1b403f9b39e697383f6e1d374863 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 00:59:26 +0700 Subject: [PATCH 012/104] Update remove --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index c9316e0..dbad486 100755 --- a/scripts/remove +++ b/scripts/remove @@ -20,7 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) console_port=$(ynh_app_setting_get --app=$app --key=console_port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -datadir==$(ynh_app_setting_get --app=$app --key=datadir) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # STANDARD REMOVE From c8eb9d1a8cdb201bcf4557a0a866d87f12465834 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:01:14 +0700 Subject: [PATCH 013/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4a1c2f9..1fbfd8c 100755 --- a/scripts/install +++ b/scripts/install @@ -200,7 +200,7 @@ ynh_script_progression --message="Adding a configuration file..." --time --weigh ynh_add_config --template="../conf/.env" --destination="$final_path/.env" -chmod 400 "$final_path/.env" +chmod 750 "$final_path/.env" chown $app:$app "$final_path/.env" ### You can add specific configuration files. From 7d27563eeb329798865b0ddd1ab04c42c6e54ba4 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:06:12 +0700 Subject: [PATCH 014/104] Update systemd.service --- conf/systemd.service | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/systemd.service b/conf/systemd.service index 7fa6cba..9e71839 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,6 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ +EnvironmentFile=__FINAL_PATH__/.env ExecStart=__FINALPATH__/minio server $MINIO_OPTS $MINIO_VOLUMES StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit From 5d352ffe8c4ab4facbdd9a89f0d4ec7211f38720 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:08:35 +0700 Subject: [PATCH 015/104] Update systemd.service --- conf/systemd.service | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 9e71839..65b39ab 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -6,41 +6,11 @@ After=network.target Type=simple User=__APP__ Group=__APP__ -WorkingDirectory=__FINALPATH__/ +WorkingDirectory=__FINAL_PATH__/ EnvironmentFile=__FINAL_PATH__/.env ExecStart=__FINALPATH__/minio server $MINIO_OPTS $MINIO_VOLUMES StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit -# Sandboxing options to harden security -# Depending on specificities of your service/app, you may need to tweak these -# .. but this should be a good baseline -# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html -NoNewPrivileges=yes -PrivateTmp=yes -PrivateDevices=yes -RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 -RestrictNamespaces=yes -RestrictRealtime=yes -DevicePolicy=closed -ProtectSystem=full -ProtectControlGroups=yes -ProtectKernelModules=yes -ProtectKernelTunables=yes -LockPersonality=yes -SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap - -# Denying access to capabilities that should not be relevant for webapps -# Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html -CapabilityBoundingSet=~CAP_RAWIO CAP_MKNOD -CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE -CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_TIME CAP_SYS_MODULE CAP_SYS_PACCT -CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK -CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM -CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG -CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE -CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW -CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG - [Install] WantedBy=multi-user.target From ae755fb30d10a5cb27e9d023ab166286eea431ce Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:15:52 +0700 Subject: [PATCH 016/104] Update nginx.conf --- conf/nginx.conf | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d211b3d..e731947 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,24 +1,4 @@ -location /server { - - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - - proxy_pass http://127.0.0.1:__PORT__; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; -} - -location /console { +location / { # Force usage of https if ($scheme = http) { From c755762276ef9dabfd0e6d7c708f87fe554cebe2 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:17:50 +0700 Subject: [PATCH 017/104] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index e731947..62f57f6 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location / { +location /__PATH_URL/ { # Force usage of https if ($scheme = http) { From fa9e24a7044ee7222a7af2d04045445bf4bfc27b Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:18:04 +0700 Subject: [PATCH 018/104] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 62f57f6..18933d7 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location /__PATH_URL/ { +location /__PATH_URL__/ { # Force usage of https if ($scheme = http) { From 0029f3ff3ed5fde83ac95ed1efc49c63dcedb1bf Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:20:07 +0700 Subject: [PATCH 019/104] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 18933d7..e731947 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location /__PATH_URL__/ { +location / { # Force usage of https if ($scheme = http) { From 2ffe0d04e99a4302ec6dd1c9dbe496d01d8c35e0 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:35:46 +0700 Subject: [PATCH 020/104] Update nginx.conf --- conf/nginx.conf | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index e731947..40ee11d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location / { +location ^~ __PATH__/console { # Force usage of https if ($scheme = http) { @@ -13,6 +13,26 @@ location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Host $server_name; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; +} + +location ^~ __PATH__/server { + + # Force usage of https + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + + proxy_pass http://127.0.0.1:__PORT__; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; From 3205f605b4eccc377980d1d1a9b7814c603aebf0 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:39:07 +0700 Subject: [PATCH 021/104] Update nginx.conf --- conf/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 40ee11d..58456c4 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location ^~ __PATH__/console { +location __PATH__/console { # Force usage of https if ($scheme = http) { @@ -18,7 +18,7 @@ location ^~ __PATH__/console { proxy_set_header Connection "upgrade"; } -location ^~ __PATH__/server { +location __PATH__/server { # Force usage of https if ($scheme = http) { From 782be7a0841f6bb1dd01e7f26d4e585e4e82be59 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:41:59 +0700 Subject: [PATCH 022/104] Update nginx.conf --- conf/nginx.conf | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 58456c4..a2ae6a2 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location __PATH__/console { +location __PATH__/ { # Force usage of https if ($scheme = http) { @@ -13,26 +13,6 @@ location __PATH__/console { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Host $server_name; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; -} - -location __PATH__/server { - - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - - proxy_pass http://127.0.0.1:__PORT__; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; From 3901751dfb3715e0e1611ab42124ec00c374bdcb Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:53:30 +0700 Subject: [PATCH 023/104] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index a2ae6a2..a4eb14b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location __PATH__/ { +location ^~ __PATH__/ { # Force usage of https if ($scheme = http) { From 89efade7709276a7460bfe16c4a6b436f7a3dfc1 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 01:56:06 +0700 Subject: [PATCH 024/104] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index a4eb14b..a692c4b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location ^~ __PATH__/ { +location = __PATH__/ { # Force usage of https if ($scheme = http) { From 199975713c200c0ea676c2faa185d8cc7e7b6a74 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 02:00:10 +0700 Subject: [PATCH 025/104] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index a692c4b..e731947 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location = __PATH__/ { +location / { # Force usage of https if ($scheme = http) { From b982852a79fae1f44e2ef5d4966871d460bb0cc0 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 02:11:35 +0700 Subject: [PATCH 026/104] Update nginx.conf --- conf/nginx.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index e731947..302fa9c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,8 @@ -location / { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { + + # Path to source + alias __FINALPATH__/ ; # Force usage of https if ($scheme = http) { From 96828a7dc8c57fa6cba6462325457e907f43f400 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 13:32:43 +0700 Subject: [PATCH 027/104] Update nginx.conf --- conf/nginx.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 302fa9c..79d8bad 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,4 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { +location / { # Path to source alias __FINALPATH__/ ; @@ -20,4 +19,4 @@ location __PATH__/ { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; -} \ No newline at end of file +} From 9e20d70bd8bcfd1994db23dc0f37038582a023f5 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 13:38:51 +0700 Subject: [PATCH 028/104] Update remove --- scripts/remove | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/remove b/scripts/remove index dbad486..6c25ac4 100755 --- a/scripts/remove +++ b/scripts/remove @@ -51,14 +51,6 @@ ynh_script_progression --message="Removing logrotate configuration..." --time -- # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --time --weight=1 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - #================================================= # REMOVE APP MAIN DIR #================================================= From d4e02e00a0f45bded8460c5c1ba290e897c1a1fb Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 13:39:39 +0700 Subject: [PATCH 029/104] Update remove --- scripts/remove | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/remove b/scripts/remove index 6c25ac4..3d7b7af 100755 --- a/scripts/remove +++ b/scripts/remove @@ -99,12 +99,6 @@ ynh_remove_fail2ban_config #================================================= ynh_script_progression --message="Removing various files..." --time --weight=1 -# Remove a cron file -ynh_secure_remove --file="/etc/cron.d/$app" - -# Remove a directory securely -ynh_secure_remove --file="/etc/$app" - # Remove the log files ynh_secure_remove --file="/var/log/$app" From 076fb1864fd084fea9712025d411dfff2675d4d6 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 13:41:11 +0700 Subject: [PATCH 030/104] Update install --- scripts/install | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 1fbfd8c..7f80898 100755 --- a/scripts/install +++ b/scripts/install @@ -25,10 +25,8 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH -#admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -language=$YNH_APP_ARG_LANGUAGE +#language=$YNH_APP_ARG_LANGUAGE ### If it's a multi-instance app, meaning it can be installed several times independently ### The id of the app as stated in the manifest is available as $YNH_APP_ID @@ -61,7 +59,7 @@ final_path=/opt/yunohost/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +ynh_webpath_register --app=$app --domain=$domain data_path=/home/yunohost.app/$app test ! -e "$data_path" || ynh_die --message="This path already contains a folder" @@ -72,8 +70,6 @@ test ! -e "$data_path" || ynh_die --message="This path already contains a folder ynh_script_progression --message="Storing installation settings..." --time --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url -#ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=language --value=$language #================================================= From b2adea4d763b602be0dd5658f52d47b0fff97acc Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 13:42:08 +0700 Subject: [PATCH 031/104] Update manifest.json --- manifest.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/manifest.json b/manifest.json index d4080b9..e2f6e8f 100644 --- a/manifest.json +++ b/manifest.json @@ -34,12 +34,6 @@ "name": "domain", "type": "domain" }, - { - "name": "path", - "type": "path", - "example": "/example", - "default": "/minio" - }, { "name": "is_public", "type": "boolean", From fc37ad19610b4e2162df1841d5c78ec3a74e8a32 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 13:44:39 +0700 Subject: [PATCH 032/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 7f80898..9ee7ec0 100755 --- a/scripts/install +++ b/scripts/install @@ -70,7 +70,7 @@ test ! -e "$data_path" || ynh_die --message="This path already contains a folder ynh_script_progression --message="Storing installation settings..." --time --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=language --value=$language +#ynh_app_setting_set --app=$app --key=language --value=$language #================================================= # STANDARD MODIFICATIONS From 4b16487d0f390a2649839639fad76bc90969a512 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 13:51:01 +0700 Subject: [PATCH 033/104] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 9ee7ec0..c6b61bb 100755 --- a/scripts/install +++ b/scripts/install @@ -25,6 +25,7 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN +path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC #language=$YNH_APP_ARG_LANGUAGE From b3b52d131d4283ad41bbe6146516bcd39ac3a6b0 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 13:52:37 +0700 Subject: [PATCH 034/104] Update install --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index c6b61bb..157b902 100755 --- a/scripts/install +++ b/scripts/install @@ -62,6 +62,7 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde # Register (book) web path ynh_webpath_register --app=$app --domain=$domain + data_path=/home/yunohost.app/$app test ! -e "$data_path" || ynh_die --message="This path already contains a folder" @@ -71,6 +72,7 @@ test ! -e "$data_path" || ynh_die --message="This path already contains a folder ynh_script_progression --message="Storing installation settings..." --time --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=language --value=$language #================================================= From d97183a6bcb7cc328060cb91f2925a33898abad9 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 14:28:05 +0700 Subject: [PATCH 035/104] Revert "Update nginx.conf" This reverts commit c3004b641a6aa94ba4e246190329fbe5037a1d03. --- conf/nginx.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 79d8bad..302fa9c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,5 @@ -location / { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { # Path to source alias __FINALPATH__/ ; @@ -19,4 +20,4 @@ location / { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; -} +} \ No newline at end of file From 9b74eda5d46ed78e14073848e9466a38bf3a2146 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 02:15:58 +0700 Subject: [PATCH 036/104] Update nginx.conf --- conf/nginx.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 302fa9c..d6bff0f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,9 +1,6 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # Path to source - alias __FINALPATH__/ ; - # Force usage of https if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; From f7099a64a2dab1ed3d20cde6e14284a1dc695607 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 14:55:54 +0700 Subject: [PATCH 037/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 157b902..e2189d5 100755 --- a/scripts/install +++ b/scripts/install @@ -378,4 +378,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --time --last +ynh_script_progression --message="Installation of $app completed" --time --last \ No newline at end of file From 5afae8884ea9d35f3d06f421b16d721e663b7bb9 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 14:57:58 +0700 Subject: [PATCH 038/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index e2189d5..da13ac6 100755 --- a/scripts/install +++ b/scripts/install @@ -60,7 +60,7 @@ final_path=/opt/yunohost/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain +ynh_webpath_register --app=$app --domain=$domain --path=$path_url data_path=/home/yunohost.app/$app From 7ee86c55bb71f564d4a8d68c42f96618dcc97722 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 14:58:53 +0700 Subject: [PATCH 039/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index da13ac6..3a93312 100755 --- a/scripts/install +++ b/scripts/install @@ -60,7 +60,7 @@ final_path=/opt/yunohost/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path=$path_url +ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url data_path=/home/yunohost.app/$app From 0daada25c0f572e512c78ae1a7488ed5bcdbde0d Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 15:13:26 +0700 Subject: [PATCH 040/104] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d6bff0f..3912090 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -6,7 +6,7 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } - proxy_pass http://127.0.0.1:__CONSOLE_PORT__; + proxy_pass http://127.0.0.1:__PORT__; proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; From e9a82fd4a1b0eb72bdc55e5e5e0afd78047ad552 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 15:18:08 +0700 Subject: [PATCH 041/104] Update nginx.conf --- conf/nginx.conf | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 3912090..1dfe578 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,5 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { +location / { # Force usage of https if ($scheme = http) { @@ -14,6 +14,26 @@ location __PATH__/ { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Host $server_name; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; +} + +location /console { + + # Force usage of https + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + + proxy_pass http://127.0.0.1:__CONSOLE_PORT__; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; From 753d8dacb43d5ab56fdc66862e64f8152a02f335 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 6 Nov 2021 15:33:52 +0700 Subject: [PATCH 042/104] Update nginx.conf --- conf/nginx.conf | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1dfe578..2a94e6a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,3 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location / { # Force usage of https @@ -18,23 +17,3 @@ location / { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; } - -location /console { - - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - - proxy_pass http://127.0.0.1:__CONSOLE_PORT__; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; -} \ No newline at end of file From 39332b8b3c546a49a3fa12323913a5701cd4a9d2 Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 9 Nov 2021 13:04:04 +0700 Subject: [PATCH 043/104] Set ID and Key --- conf/.env | 4 ++-- scripts/install | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/conf/.env b/conf/.env index 3c61e0d..3d2b6e1 100644 --- a/conf/.env +++ b/conf/.env @@ -1,4 +1,4 @@ -MINIO_ROOT_USER="minio" +MINIO_ROOT_USER=__ID__ MINIO_VOLUMES="__DATADIR__/" MINIO_OPTS="-C __FINAL_PATH__/ --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" -MINIO_ROOT_PASSWORD="miniostorage" \ No newline at end of file +MINIO_ROOT_PASSWORD=__KEY__ \ No newline at end of file diff --git a/scripts/install b/scripts/install index 3a93312..c1be0a9 100755 --- a/scripts/install +++ b/scripts/install @@ -41,6 +41,9 @@ is_public=$YNH_APP_ARG_IS_PUBLIC ### db names... app=$YNH_APP_INSTANCE_NAME +id="minio" +key="miniostorage" # TO BE CHANGED TO RANDOM GEN + #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= @@ -74,6 +77,8 @@ ynh_script_progression --message="Storing installation settings..." --time --wei ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url #ynh_app_setting_set --app=$app --key=language --value=$language +ynh_app_setting_set --app=$app --key=id --value=$id +ynh_app_setting_set --app=$app --key=key --value=$key #================================================= # STANDARD MODIFICATIONS From dda3d8b798d219de571f84daa84da5f978d5e19c Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 9 Nov 2021 17:26:34 +0700 Subject: [PATCH 044/104] Better key handling --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index c1be0a9..d343345 100755 --- a/scripts/install +++ b/scripts/install @@ -41,8 +41,8 @@ is_public=$YNH_APP_ARG_IS_PUBLIC ### db names... app=$YNH_APP_INSTANCE_NAME -id="minio" -key="miniostorage" # TO BE CHANGED TO RANDOM GEN +minio_id="minio" +minio_key=`openssl rand -hex 32` # TO BE CHANGED TO RANDOM GEN #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS @@ -77,8 +77,8 @@ ynh_script_progression --message="Storing installation settings..." --time --wei ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url #ynh_app_setting_set --app=$app --key=language --value=$language -ynh_app_setting_set --app=$app --key=id --value=$id -ynh_app_setting_set --app=$app --key=key --value=$key +ynh_app_setting_set --app=$app --key=minio_id --value=$minio_id +ynh_app_setting_set --app=$app --key=minio_key --value=$minio_key #================================================= # STANDARD MODIFICATIONS From 8c8cd17f2becaf4d4138ad04c459166609b111d0 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 10 Nov 2021 00:52:38 +0700 Subject: [PATCH 045/104] Update .env --- conf/.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/.env b/conf/.env index 3d2b6e1..c666778 100644 --- a/conf/.env +++ b/conf/.env @@ -1,4 +1,4 @@ -MINIO_ROOT_USER=__ID__ +MINIO_ROOT_USER=__MINIO_ID__ MINIO_VOLUMES="__DATADIR__/" MINIO_OPTS="-C __FINAL_PATH__/ --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" -MINIO_ROOT_PASSWORD=__KEY__ \ No newline at end of file +MINIO_ROOT_PASSWORD=__MINIO_KEY__ \ No newline at end of file From 5e60b79696c44199366cd8781662674e4b89b960 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 10 Nov 2021 01:34:25 +0700 Subject: [PATCH 046/104] Update nginx.conf --- conf/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 2a94e6a..43fa859 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,6 +12,7 @@ location / { proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Host $server_name; + client_max_body_size 200M; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; From a77544cd83be902e3ec501f6ba595fd4e1b8a882 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 10 Nov 2021 01:34:47 +0700 Subject: [PATCH 047/104] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 783a4ae..8f144f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *~ *.sw[op] +.DS_Store From 49862b5dc6958ecead3ab7892e6f9c316e9881db Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 10 Nov 2021 23:45:25 +0700 Subject: [PATCH 048/104] Backup + Restore + Upgrade --- manifest.json | 10 ------ scripts/backup | 17 ---------- scripts/install | 7 ++-- scripts/restore | 24 ++------------ scripts/upgrade | 88 +++++-------------------------------------------- 5 files changed, 13 insertions(+), 133 deletions(-) diff --git a/manifest.json b/manifest.json index e2f6e8f..6a98744 100644 --- a/manifest.json +++ b/manifest.json @@ -38,16 +38,6 @@ "name": "is_public", "type": "boolean", "default": true - }, - { - "name": "language", - "type": "string", - "ask": { - "en": "Choose the application language", - "fr": "Choisissez la langue de l'application" - }, - "choices": ["fr", "en"], - "default": "fr" } ] } diff --git a/scripts/backup b/scripts/backup index f99225d..d2e30b7 100755 --- a/scripts/backup +++ b/scripts/backup @@ -31,7 +31,6 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= @@ -62,12 +61,6 @@ ynh_backup --src_path="$datadir" --is_big ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - -ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - #================================================= # BACKUP FAIL2BAN CONFIGURATION #================================================= @@ -97,16 +90,6 @@ ynh_backup --src_path="/etc/cron.d/$app" ynh_backup --src_path="/etc/$app/" -#================================================= -# BACKUP THE MYSQL DATABASE -#================================================= -ynh_print_info --message="Backing up the MySQL database..." - -### (However, things like MySQL dumps *do* take some time to run, though the -### copy of the generated dump to the archive still happens later) - -ynh_mysql_dump_db --database="$db_name" > db.sql - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index d343345..99ccead 100755 --- a/scripts/install +++ b/scripts/install @@ -66,8 +66,8 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url -data_path=/home/yunohost.app/$app -test ! -e "$data_path" || ynh_die --message="This path already contains a folder" +datadir=/home/yunohost.app/$app +test ! -e "$datadir" || ynh_die --message="This path already contains a folder" #================================================= # STORE SETTINGS FROM MANIFEST @@ -76,7 +76,6 @@ ynh_script_progression --message="Storing installation settings..." --time --wei ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -#ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=minio_id --value=$minio_id ynh_app_setting_set --app=$app --key=minio_key --value=$minio_key @@ -141,6 +140,7 @@ ynh_script_progression --message="Setting up source files..." --time --weight=1 ### `ynh_setup_source` use the file conf/app.src 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" @@ -182,7 +182,6 @@ ynh_script_progression --message="Creating a data directory..." --time --weight= ### - Remove the section "BACKUP THE DATA DIR" in the backup script ### - As well as the section "RESTORE THE DATA DIRECTORY" in the restore script -datadir=/home/yunohost.app/$app ynh_app_setting_set --app=$app --key=datadir --value=$datadir mkdir -p $datadir diff --git a/scripts/restore b/scripts/restore index f9a46dc..0b2c711 100755 --- a/scripts/restore +++ b/scripts/restore @@ -31,9 +31,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= @@ -97,13 +94,6 @@ chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --time --weight=1 - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - #================================================= # RESTORE FAIL2BAN CONFIGURATION #================================================= @@ -123,15 +113,6 @@ ynh_script_progression --message="Reinstalling dependencies..." --time --weight= # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." --time --weight=1 - -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql - #================================================= # RESTORE VARIOUS FILES #================================================= @@ -173,11 +154,10 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap #================================================= # GENERIC FINALIZATION #================================================= -# RELOAD NGINX AND PHP-FPM +# RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 -ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 855b543..c2b37ab 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,10 +18,10 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -language=$(ynh_app_setting_get --app=$app --key=language) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) +minio_id=$(ynh_app_setting_get --app=$app --key=minio_id) +minio_key=$(ynh_app_setting_get --app=$app --key=minio_key) + #================================================= # CHECK VERSION @@ -58,49 +58,6 @@ ynh_script_progression --message="Stopping a systemd service..." --time --weight ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --time --weight=1 - -# -# N.B. : the followings setting migrations snippets are provided as *EXAMPLES* -# of what you may want to do in some cases (e.g. a setting was not defined on -# some legacy installs and you therefore want to initiaze stuff during upgrade) -# - -# If db_name doesn't exist, create it -#if [ -z "$db_name" ]; then -# db_name=$(ynh_sanitize_dbid --db_name=$app) -# ynh_app_setting_set --app=$app --key=db_name --value=$db_name -#fi - -# 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 - -### If nobody installed your app before 4.1, -### then you may safely remove these lines - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - -if ! ynh_permission_exists --permission="admin"; then - # Create the required permissions - ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin -fi - -# Create a permission if needed -if ! ynh_permission_exists --permission="api"; then - ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" -fi - #================================================= # CREATE DEDICATED USER #================================================= @@ -147,43 +104,14 @@ ynh_script_progression --message="Upgrading dependencies..." --time --weight=1 ynh_install_app_dependencies $pkg_dependencies #================================================= -# PHP-FPM CONFIGURATION +# ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --time --weight=1 +ynh_script_progression --message="Adding a configuration file..." --time --weight=1 -# Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_config --template="../conf/.env" --destination="$final_path/.env" -#================================================= -# SPECIFIC UPGRADE -#================================================= -# ... -#================================================= - -#================================================= -# UPDATE A CONFIG FILE -#================================================= -ynh_script_progression --message="Updating a configuration file..." --time --weight=1 - -### Same as during install -### -### The file will automatically be backed-up if it's found to be manually modified (because -### ynh_add_config keeps track of the file's checksum) - -ynh_add_config --template="some_config_file" --destination="$final_path/some_config_file" - -# FIXME: this should be handled by the core in the future -# You may need to use chmod 600 instead of 400, -# for example if the app is expected to be able to modify its own config -chmod 400 "$final_path/some_config_file" -chown $app:$app "$final_path/some_config_file" - -### For more complex cases where you want to replace stuff using regexes, -### you shoud rely on ynh_replace_string (which is basically a wrapper for sed) -### When doing so, you also need to manually call ynh_store_file_checksum -### -### ynh_replace_string --match_string="match_string" --replace_string="replace_string" --target_file="$final_path/some_config_file" -### ynh_store_file_checksum --file="$final_path/some_config_file" +chmod 750 "$final_path/.env" +chown $app:$app "$final_path/.env" #================================================= # SETUP SYSTEMD From 705f80ca540ed8baca54a1f5efa905d2c585634f Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 10 Nov 2021 23:51:11 +0700 Subject: [PATCH 049/104] Update version format --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 6a98744..5c2c1da 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "MinIO is a High Performance, Kubernetes Native Object Storage", "fr": "MinIO est un serveur de stockage d'objets hautes performances" }, - "version": "RELEASE.2021-11-05T09-16-26Z~ynh1", + "version": "2021-11-05T09-16-26Z~ynh1", "url": "https://min.io/", "upstream": { "license": "free", From 514e1d8b1e0f7fb9c06673da9e02c283b28dce25 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 10 Nov 2021 23:54:22 +0700 Subject: [PATCH 050/104] Update backup --- scripts/backup | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/backup b/scripts/backup index d2e30b7..2f97bac 100755 --- a/scripts/backup +++ b/scripts/backup @@ -82,14 +82,6 @@ ynh_backup --src_path="/etc/logrotate.d/$app" ynh_backup --src_path="/etc/systemd/system/$app.service" -#================================================= -# BACKUP VARIOUS FILES -#================================================= - -ynh_backup --src_path="/etc/cron.d/$app" - -ynh_backup --src_path="/etc/$app/" - #================================================= # END OF SCRIPT #================================================= From 954d627a407aacf11c2d6e6d767737557f7af26e Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 10 Nov 2021 23:59:59 +0700 Subject: [PATCH 051/104] Update restore --- scripts/restore | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/restore b/scripts/restore index 0b2c711..f431ccd 100755 --- a/scripts/restore +++ b/scripts/restore @@ -103,16 +103,6 @@ ynh_restore_file "/etc/fail2ban/jail.d/$app.conf" ynh_restore_file "/etc/fail2ban/filter.d/$app.conf" ynh_systemd_action --action=restart --service_name=fail2ban -#================================================= -# SPECIFIC RESTORATION -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --time --weight=1 - -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies - #================================================= # RESTORE VARIOUS FILES #================================================= From 1ab5e4cd84a412199da888b84ef83192a9a32ce1 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 00:03:59 +0700 Subject: [PATCH 052/104] Update restore --- scripts/restore | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/restore b/scripts/restore index f431ccd..b42080e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -103,15 +103,6 @@ ynh_restore_file "/etc/fail2ban/jail.d/$app.conf" ynh_restore_file "/etc/fail2ban/filter.d/$app.conf" ynh_systemd_action --action=restart --service_name=fail2ban -#================================================= -# RESTORE VARIOUS FILES -#================================================= -ynh_script_progression --message="Restoring various files..." --time --weight=1 - -ynh_restore_file --origin_path="/etc/cron.d/$app" - -ynh_restore_file --origin_path="/etc/$app/" - #================================================= # RESTORE SYSTEMD #================================================= From 695fea2c216b7a5b3cfd7dc5a93eea66114562db Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 08:44:52 +0700 Subject: [PATCH 053/104] Upgrade and restore --- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/restore b/scripts/restore index b42080e..a1db7a2 100755 --- a/scripts/restore +++ b/scripts/restore @@ -73,7 +73,7 @@ ynh_restore_file --origin_path="$final_path" # this will be treated as a security issue. chmod 750 "$final_path" chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chown -R $app:$app "$final_path" #================================================= # RESTORE THE DATA DIRECTORY @@ -123,7 +123,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="A High Performance, Kubernetes Native Object Storage" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index c2b37ab..45a9d9e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -86,7 +86,7 @@ fi # this will be treated as a security issue. chmod 750 "$final_path" chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chown -R $app:$app "$final_path" #================================================= # NGINX CONFIGURATION @@ -136,7 +136,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="A High Performance, Kubernetes Native Object Storage" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE From 0d707991c13f8b52adf2575a8654203f2b4e9a11 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 09:10:16 +0700 Subject: [PATCH 054/104] Test logs --- scripts/backup | 6 ++++++ scripts/restore | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/scripts/backup b/scripts/backup index 2f97bac..b5eae4f 100755 --- a/scripts/backup +++ b/scripts/backup @@ -76,6 +76,12 @@ ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" ynh_backup --src_path="/etc/logrotate.d/$app" +#================================================= +# BACKUP LOGS +#================================================= + +ynh_backup --src_path="/var/log/$app/$app.log" + #================================================= # BACKUP SYSTEMD #================================================= diff --git a/scripts/restore b/scripts/restore index a1db7a2..caa3d6b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -118,6 +118,13 @@ ynh_script_progression --message="Restoring the logrotate configuration..." --ti ynh_restore_file --origin_path="/etc/logrotate.d/$app" +#================================================= +# RESTORE THE LOGS +#================================================= +ynh_script_progression --message="Restoring the logs..." --time --weight=1 + +ynh_restore_file --origin_path="/var/log/$app/$app.log" + #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= From 72ce666b69e792245f6a84bcfde10b2be532c60b Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 09:27:44 +0700 Subject: [PATCH 055/104] Update manifest.json --- manifest.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index 5c2c1da..82a2559 100644 --- a/manifest.json +++ b/manifest.json @@ -9,17 +9,15 @@ "version": "2021-11-05T09-16-26Z~ynh1", "url": "https://min.io/", "upstream": { - "license": "free", - "website": "https://example.com", - "demo": "https://demo.example.com", + "license": "agpl-3.0", + "website": "https://min.io", "admindoc": "https://yunohost.org/packaging_apps", "userdoc": "https://yunohost.org/apps", - "code": "https://some.forge.com/example/example" + "code": "https://github.com/minio/minio" }, - "license": "free", + "license": "agpl-3.0", "maintainer": { - "name": "John doe", - "email": "john.doe@example.com" + "name": "Raoul de Limezy", }, "requirements": { "yunohost": ">= 4.1.3" From 893a25538f60ebf979cfd4fb15d8bb2f215c7410 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 09:28:32 +0700 Subject: [PATCH 056/104] Update LICENSE --- LICENSE | 663 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 660 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index f3cff84..ef4addc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,661 @@ -File containing the license of your package. + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 -More information here: -https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-13---indiquer-la-licence-associ%C3%A9e-au-paquet---brouillon--auto--working- + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. \ No newline at end of file From 61231763afc58681ca6c4544d4fef8d1cbbcf800 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 09:31:38 +0700 Subject: [PATCH 057/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 99ccead..a7a39b8 100755 --- a/scripts/install +++ b/scripts/install @@ -42,7 +42,7 @@ is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME minio_id="minio" -minio_key=`openssl rand -hex 32` # TO BE CHANGED TO RANDOM GEN +minio_key=$(ynh_string_random) #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS From afb0c7b08b17d5fc57c4962059848b0f3ee2c9a4 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 09:33:46 +0700 Subject: [PATCH 058/104] Update README_fr.md --- README_fr.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 74c4949..4136ca0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1 +1,2 @@ -### Serveur MinIO \ No newline at end of file +### Serveur MinIO +[![Integration level](https://dash.yunohost.org/integration/minio.svg)](https://dash.yunohost.org/appci/app/minio) \ No newline at end of file From fc33863231fe0304537ef8d56d0cc109cba2c74d Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 09:34:40 +0700 Subject: [PATCH 059/104] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ea9fa12..1a912d9 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ ### MinIO server +[![Integration level](https://dash.yunohost.org/integration/minio.svg)](https://dash.yunohost.org/appci/app/minio) \ No newline at end of file From 0be800b9ad49510344e32f47ea136ec8b6d355a5 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 10:27:20 +0700 Subject: [PATCH 060/104] Stupid mistake --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 82a2559..770d45a 100644 --- a/manifest.json +++ b/manifest.json @@ -17,7 +17,7 @@ }, "license": "agpl-3.0", "maintainer": { - "name": "Raoul de Limezy", + "name": "Raoul de Limezy" }, "requirements": { "yunohost": ">= 4.1.3" From 4974bddfe276757dfe57d2e654bb8a2679413205 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 10:30:57 +0700 Subject: [PATCH 061/104] Checks update --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index fefa192..8dc90bc 100644 --- a/check_process +++ b/check_process @@ -6,7 +6,7 @@ ;; Test complet ; Manifest domain="domain.tld" - path="/path" + path="/" admin="john" language="fr" is_public=1 @@ -22,7 +22,7 @@ upgrade=1 upgrade=1 from_commit=CommitHash backup_restore=1 - multi_instance=1 + multi_instance=0 port_already_use=0 change_url=1 ;;; Options From 8727966963f9ffc43c0d69aa4203f54ebbc8ba6a Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 10:39:45 +0700 Subject: [PATCH 062/104] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 770d45a..f8c75b2 100644 --- a/manifest.json +++ b/manifest.json @@ -9,13 +9,13 @@ "version": "2021-11-05T09-16-26Z~ynh1", "url": "https://min.io/", "upstream": { - "license": "agpl-3.0", + "license": "AGPL-3.0-only", "website": "https://min.io", "admindoc": "https://yunohost.org/packaging_apps", "userdoc": "https://yunohost.org/apps", "code": "https://github.com/minio/minio" }, - "license": "agpl-3.0", + "license": "AGPL-3.0-only", "maintainer": { "name": "Raoul de Limezy" }, From 5df1ac1895bd15271f0afac3f2ede4a4a3aebf1d Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 11:04:49 +0700 Subject: [PATCH 063/104] Updates --- check_process | 4 ++-- manifest.json | 4 ++-- scripts/upgrade | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index 8dc90bc..6672889 100644 --- a/check_process +++ b/check_process @@ -14,8 +14,8 @@ port="666" ; Checks pkg_linter=1 - setup_sub_dir=1 - setup_root=1 + setup_sub_dir=0 + setup_root=0 setup_nourl=0 setup_private=1 setup_public=1 diff --git a/manifest.json b/manifest.json index f8c75b2..d4bde56 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "minio", "packaging_format": 1, "description": { - "en": "MinIO is a High Performance, Kubernetes Native Object Storage", - "fr": "MinIO est un serveur de stockage d'objets hautes performances" + "en": "High Performance, Kubernetes Native Object Storage", + "fr": "Serveur de stockage d'objets hautes performances" }, "version": "2021-11-05T09-16-26Z~ynh1", "url": "https://min.io/", diff --git a/scripts/upgrade b/scripts/upgrade index 45a9d9e..05e0362 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,6 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --time --wei app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) +port=$(ynh_app_setting_get --app=$app --key=port) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) minio_id=$(ynh_app_setting_get --app=$app --key=minio_id) From dd309d0412c2556c4af6c56663b7de6a35536b19 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 14:43:03 +0700 Subject: [PATCH 064/104] Adding mc client inside Minio app instead of Outline app --- conf/mc.src | 7 +++++++ scripts/backup | 1 + scripts/install | 28 ++++++++++++++++++++++++++++ scripts/restore | 2 ++ 4 files changed, 38 insertions(+) create mode 100644 conf/mc.src diff --git a/conf/mc.src b/conf/mc.src new file mode 100644 index 0000000..8f12cdd --- /dev/null +++ b/conf/mc.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2021-11-05T10-05-06Z +SOURCE_SUM=9f5ad72fd93678f9f756c6da34a8d4d1e61f7356a96ee327c652ad765975d2b2 +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT= +SOURCE_IN_SUBDIR=false +SOURCE_FILENAME=mc +SOURCE_EXTRACT=false diff --git a/scripts/backup b/scripts/backup index b5eae4f..b01124b 100755 --- a/scripts/backup +++ b/scripts/backup @@ -32,6 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) datadir=$(ynh_app_setting_get --app=$app --key=datadir) +mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP diff --git a/scripts/install b/scripts/install index a7a39b8..ee0fd9c 100755 --- a/scripts/install +++ b/scripts/install @@ -62,6 +62,8 @@ ynh_script_progression --message="Validating installation parameters..." --time final_path=/opt/yunohost/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" +mc_path=$final_path/mc + # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url @@ -78,6 +80,8 @@ 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=minio_id --value=$minio_id ynh_app_setting_set --app=$app --key=minio_key --value=$minio_key +ynh_app_setting_set --app=$app --key=mc_path --value=$mc_path + #================================================= # STANDARD MODIFICATIONS @@ -154,6 +158,30 @@ chmod -R 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# DOWNLOAD, CHECK AND UNPACK MINIO CLIENT +#================================================= +ynh_script_progression --message="Setting up MinIO client..." --time --weight=1 + +ynh_setup_source --dest_dir="$mc_path" --source_id=mc + +# FIXME: this should be managed by the core in the future +# Here, as a packager, you may have to tweak the ownerhsip/permissions +# such that the appropriate users (e.g. maybe www-data) can access +# files in some cases. +# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder - +# this will be treated as a security issue. +chmod -R 750 "$mc_path" +chmod -R o-rwx "$mc_path" +chown -R $app:www-data "$mc_path" + +#================================================= +# SETUP MINIO CLIENT +#================================================= +ynh_script_progression --message="Setting up MinIO bucket for Outline..." --time --weight=1 + +$mc_path/mc alias set minio "https://$domain" $minio_id $minio_key + #================================================= # NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index caa3d6b..d960d38 100755 --- a/scripts/restore +++ b/scripts/restore @@ -32,6 +32,8 @@ 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) datadir=$(ynh_app_setting_get --app=$app --key=datadir) +mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) + #================================================= # CHECK IF THE APP CAN BE RESTORED From 2c0240d2cd98abd4bd608283bf506fad99cc9379 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 14:51:11 +0700 Subject: [PATCH 065/104] Update install --- scripts/install | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index ee0fd9c..d5c6f80 100755 --- a/scripts/install +++ b/scripts/install @@ -175,13 +175,6 @@ chmod -R 750 "$mc_path" chmod -R o-rwx "$mc_path" chown -R $app:www-data "$mc_path" -#================================================= -# SETUP MINIO CLIENT -#================================================= -ynh_script_progression --message="Setting up MinIO bucket for Outline..." --time --weight=1 - -$mc_path/mc alias set minio "https://$domain" $minio_id $minio_key - #================================================= # NGINX CONFIGURATION #================================================= @@ -406,6 +399,13 @@ ynh_script_progression --message="Reloading NGINX web server..." --time --weight ynh_systemd_action --service_name=nginx --action=reload +#================================================= +# SETUP MINIO CLIENT +#================================================= +ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 + +$mc_path/mc alias set minio "https://$domain" $minio_id $minio_key + #================================================= # END OF SCRIPT #================================================= From 2228bfa88d6063c3ec6e52cec7f9a76a5a3e2973 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 15:08:59 +0700 Subject: [PATCH 066/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d5c6f80..d5a5ee0 100755 --- a/scripts/install +++ b/scripts/install @@ -404,7 +404,7 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 -$mc_path/mc alias set minio "https://$domain" $minio_id $minio_key +#$mc_path/mc alias set minio $domain $minio_id $minio_key #================================================= # END OF SCRIPT From 25df7a14ff4653ab2cf68b0088d10f0f90b74b9b Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 15:26:22 +0700 Subject: [PATCH 067/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d5a5ee0..afae49f 100755 --- a/scripts/install +++ b/scripts/install @@ -404,7 +404,7 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 -#$mc_path/mc alias set minio $domain $minio_id $minio_key +mc_path/mc alias set minio $domain $minio_id $minio_key #================================================= # END OF SCRIPT From 23f693a5448ee3fb6c8a035c7e5a3f481d1eeb54 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 15:29:52 +0700 Subject: [PATCH 068/104] Update install --- scripts/install | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index afae49f..807b1ac 100755 --- a/scripts/install +++ b/scripts/install @@ -404,7 +404,9 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 -mc_path/mc alias set minio $domain $minio_id $minio_key +pushd $mc_path + ynh_exec_warn_less sudo -u minio mc alias set minio $domain $minio_id $minio_key +popd #================================================= # END OF SCRIPT From 512911475f55f142b8fccccd6a134de76520a1a1 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 15:30:47 +0700 Subject: [PATCH 069/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 807b1ac..6e4c78b 100755 --- a/scripts/install +++ b/scripts/install @@ -405,7 +405,7 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 pushd $mc_path - ynh_exec_warn_less sudo -u minio mc alias set minio $domain $minio_id $minio_key + ynh_exec_warn_less sudo -u minio ./mc alias set minio $domain $minio_id $minio_key popd #================================================= From 520840d7ead4ec172f79cde080f342d35d24ec6e Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 15:32:13 +0700 Subject: [PATCH 070/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 6e4c78b..3c79a04 100755 --- a/scripts/install +++ b/scripts/install @@ -405,7 +405,7 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 pushd $mc_path - ynh_exec_warn_less sudo -u minio ./mc alias set minio $domain $minio_id $minio_key + ynh_exec_warn_less sudo -u minio ./mc alias set minio "https://$domain" $minio_id $minio_key popd #================================================= From 7ba811a3f77f3da3196cde29e0d3e18d30b9512d Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 15:36:07 +0700 Subject: [PATCH 071/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3c79a04..5d7c8fb 100755 --- a/scripts/install +++ b/scripts/install @@ -405,7 +405,7 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 pushd $mc_path - ynh_exec_warn_less sudo -u minio ./mc alias set minio "https://$domain" $minio_id $minio_key + #ynh_exec_warn_less sudo -u minio ./mc alias set minio "https://$domain" $minio_id $minio_key popd #================================================= From 7b592981f6a76141e521c5efdf9c46d6202a50c4 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 15:39:57 +0700 Subject: [PATCH 072/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 5d7c8fb..d846c6a 100755 --- a/scripts/install +++ b/scripts/install @@ -405,7 +405,7 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 pushd $mc_path - #ynh_exec_warn_less sudo -u minio ./mc alias set minio "https://$domain" $minio_id $minio_key + ynh_exec_warn_less sudo -u minio ./mc alias set minio "https://$domain" "$minio_id" "$minio_key" popd #================================================= From de52cf21a5569059a1722e33ac52043788b08337 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 15:44:50 +0700 Subject: [PATCH 073/104] Update install --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index d846c6a..0a64d67 100755 --- a/scripts/install +++ b/scripts/install @@ -404,6 +404,8 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 +sleep 10 + pushd $mc_path ynh_exec_warn_less sudo -u minio ./mc alias set minio "https://$domain" "$minio_id" "$minio_key" popd From fca4b72b7f527e9f9dff3342a09a1c3f5dec9156 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 15:53:40 +0700 Subject: [PATCH 074/104] Update install --- scripts/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 0a64d67..89b250d 100755 --- a/scripts/install +++ b/scripts/install @@ -397,15 +397,13 @@ fi #================================================= ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +ynh_systemd_action --service_name=nginx --action=reload --line_match="Reloaded A high performance web server and a reverse proxy server." #================================================= # SETUP MINIO CLIENT #================================================= ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 -sleep 10 - pushd $mc_path ynh_exec_warn_less sudo -u minio ./mc alias set minio "https://$domain" "$minio_id" "$minio_key" popd From a391958a43f5ca6955764a3025a94b3a6dc35c2f Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 11 Nov 2021 21:30:15 +0700 Subject: [PATCH 075/104] Update install --- scripts/install | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 89b250d..8a0109d 100755 --- a/scripts/install +++ b/scripts/install @@ -397,7 +397,9 @@ fi #================================================= ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 -ynh_systemd_action --service_name=nginx --action=reload --line_match="Reloaded A high performance web server and a reverse proxy server." +ynh_systemd_action --service_name=nginx --action=reload + +sleep 5 #================================================= # SETUP MINIO CLIENT From d2f9292bcb579febad42450228cbaac43d78b4eb Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 30 Jan 2022 14:33:45 +0000 Subject: [PATCH 076/104] Auto-update README --- README.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++-- README_fr.md | 70 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 140 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1a912d9..20c5cc3 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,72 @@ -### MinIO server -[![Integration level](https://dash.yunohost.org/integration/minio.svg)](https://dash.yunohost.org/appci/app/minio) \ No newline at end of file + + +# MinIO server for YunoHost + +[![Integration level](https://dash.yunohost.org/integration/minio.svg)](https://dash.yunohost.org/appci/app/minio) ![](https://ci-apps.yunohost.org/ci/badges/minio.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/minio.maintain.svg) +[![Install MinIO server with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=minio) + +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install MinIO server quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* + +## Overview + +Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + +### Features + +- Ut enim ad minim veniam, quis nostrud exercitation ullamco ; +- Laboris nisi ut aliquip ex ea commodo consequat ; +- Duis aute irure dolor in reprehenderit in voluptate ; +- Velit esse cillum dolore eu fugiat nulla pariatur ; +- Excepteur sint occaecat cupidatat non proident, sunt in culpa." + + +**Shipped version:** 2021-11-05T09-16-26Z~ynh1 + + + +## Screenshots + +![](./doc/screenshots/example.jpg) + +## Disclaimers / important information + +* Any known limitations, constrains or stuff not working, such as (but not limited to): + * requiring a full dedicated domain ? + * architectures not supported ? + * not-working single-sign on or LDAP integration ? + * the app requires an important amount of RAM / disk / .. to install or to work properly + * etc... + +* Other infos that people should be aware of, such as: + * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) + * how to configure / administrate the application if it ain't obvious + * upgrade process / specificities / things to be aware of ? + * security considerations ? + +## Documentation and resources + +* Official app website: https://min.io +* Official user documentation: https://yunohost.org/apps +* Official admin documentation: https://yunohost.org/packaging_apps +* Upstream app code repository: https://github.com/minio/minio +* YunoHost documentation for this app: https://yunohost.org/app_minio +* Report a bug: https://github.com/YunoHost-Apps/minio_ynh/issues + +## Developer info + +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/minio_ynh/tree/testing). + +To try the testing branch, please proceed like that. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/minio_ynh/tree/testing --debug +or +sudo yunohost app upgrade minio -u https://github.com/YunoHost-Apps/minio_ynh/tree/testing --debug +``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 4136ca0..10f65f1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,2 +1,68 @@ -### Serveur MinIO -[![Integration level](https://dash.yunohost.org/integration/minio.svg)](https://dash.yunohost.org/appci/app/minio) \ No newline at end of file +# MinIO server pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/minio.svg)](https://dash.yunohost.org/appci/app/minio) ![](https://ci-apps.yunohost.org/ci/badges/minio.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/minio.maintain.svg) +[![Installer MinIO server avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=minio) + +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* + +> *Ce package vous permet d'installer MinIO server 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 + +Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + +### Features + +- Ut enim ad minim veniam, quis nostrud exercitation ullamco ; +- Laboris nisi ut aliquip ex ea commodo consequat ; +- Duis aute irure dolor in reprehenderit in voluptate ; +- Velit esse cillum dolore eu fugiat nulla pariatur ; +- Excepteur sint occaecat cupidatat non proident, sunt in culpa." + + +**Version incluse :** 2021-11-05T09-16-26Z~ynh1 + + + +## Captures d'écran + +![](./doc/screenshots/example.jpg) + +## Avertissements / informations importantes + +* Any known limitations, constrains or stuff not working, such as (but not limited to): + * requiring a full dedicated domain ? + * architectures not supported ? + * not-working single-sign on or LDAP integration ? + * the app requires an important amount of RAM / disk / .. to install or to work properly + * etc... + +* Other infos that people should be aware of, such as: + * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) + * how to configure / administrate the application if it ain't obvious + * upgrade process / specificities / things to be aware of ? + * security considerations ? + +## Documentations et ressources + +* Site officiel de l'app : https://min.io +* Documentation officielle utilisateur : https://yunohost.org/apps +* Documentation officielle de l'admin : https://yunohost.org/packaging_apps +* Dépôt de code officiel de l'app : https://github.com/minio/minio +* Documentation YunoHost pour cette app : https://yunohost.org/app_minio +* Signaler un bug : https://github.com/YunoHost-Apps/minio_ynh/issues + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/minio_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/minio_ynh/tree/testing --debug +ou +sudo yunohost app upgrade minio -u https://github.com/YunoHost-Apps/minio_ynh/tree/testing --debug +``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From a96e5dd161ac34c43f2f27478da84a80d0fe82ae Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 15:41:27 +0100 Subject: [PATCH 077/104] Fix --- check_process | 11 +-- conf/.env | 2 +- conf/amd64.src | 6 ++ conf/app.src | 7 -- conf/arm64.src | 6 ++ conf/mc.src | 1 - conf/nginx.conf | 5 -- manifest.json | 7 +- scripts/backup | 5 -- scripts/install | 220 ++---------------------------------------------- scripts/remove | 36 +++----- scripts/restore | 23 +---- scripts/upgrade | 26 +----- 13 files changed, 39 insertions(+), 316 deletions(-) create mode 100644 conf/amd64.src delete mode 100644 conf/app.src create mode 100644 conf/arm64.src diff --git a/check_process b/check_process index 6672889..c3c4b2f 100644 --- a/check_process +++ b/check_process @@ -1,17 +1,9 @@ -# See here for more information -# https://github.com/YunoHost/package_check#syntax-check_process-file - -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest domain="domain.tld" path="/" - admin="john" - language="fr" is_public=1 password="1Strong-Password" - port="666" ; Checks pkg_linter=1 setup_sub_dir=0 @@ -20,10 +12,9 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=CommitHash + #upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=0 - port_already_use=0 change_url=1 ;;; Options Email= diff --git a/conf/.env b/conf/.env index c666778..3b881ee 100644 --- a/conf/.env +++ b/conf/.env @@ -1,4 +1,4 @@ -MINIO_ROOT_USER=__MINIO_ID__ +MINIO_ROOT_USER=__APP__ MINIO_VOLUMES="__DATADIR__/" MINIO_OPTS="-C __FINAL_PATH__/ --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" MINIO_ROOT_PASSWORD=__MINIO_KEY__ \ No newline at end of file diff --git a/conf/amd64.src b/conf/amd64.src new file mode 100644 index 0000000..ae7431b --- /dev/null +++ b/conf/amd64.src @@ -0,0 +1,6 @@ +SOURCE_URL=https://dl.min.io/server/minio/release/linux-amd64/minio +SOURCE_SUM=d81f52faf6f0626fa4b23964c403bae60ff840577f4d75ec3e208ceb78f19ee2 +SOURCE_SUM_PRG=sha256sum +SOURCE_IN_SUBDIR=false +SOURCE_FILENAME=minio +SOURCE_EXTRACT=false diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index ab0fe4f..0000000 --- a/conf/app.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2021-11-05T09-16-26Z -SOURCE_SUM=6398ef9107d248cc25e4f21aa36d582b5bf74d9b1c671fa79c81c1f4f607531f -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT= -SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=minio -SOURCE_EXTRACT=false diff --git a/conf/arm64.src b/conf/arm64.src new file mode 100644 index 0000000..ae7431b --- /dev/null +++ b/conf/arm64.src @@ -0,0 +1,6 @@ +SOURCE_URL=https://dl.min.io/server/minio/release/linux-amd64/minio +SOURCE_SUM=d81f52faf6f0626fa4b23964c403bae60ff840577f4d75ec3e208ceb78f19ee2 +SOURCE_SUM_PRG=sha256sum +SOURCE_IN_SUBDIR=false +SOURCE_FILENAME=minio +SOURCE_EXTRACT=false diff --git a/conf/mc.src b/conf/mc.src index 8f12cdd..3114d22 100644 --- a/conf/mc.src +++ b/conf/mc.src @@ -1,7 +1,6 @@ SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2021-11-05T10-05-06Z SOURCE_SUM=9f5ad72fd93678f9f756c6da34a8d4d1e61f7356a96ee327c652ad765975d2b2 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT= SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mc SOURCE_EXTRACT=false diff --git a/conf/nginx.conf b/conf/nginx.conf index 43fa859..10b366e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,5 @@ location / { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_pass http://127.0.0.1:__PORT__; proxy_redirect off; proxy_set_header Host $host; diff --git a/manifest.json b/manifest.json index d4bde56..5998506 100644 --- a/manifest.json +++ b/manifest.json @@ -6,13 +6,12 @@ "en": "High Performance, Kubernetes Native Object Storage", "fr": "Serveur de stockage d'objets hautes performances" }, - "version": "2021-11-05T09-16-26Z~ynh1", + "version": "2022.01.28~ynh1", "url": "https://min.io/", "upstream": { "license": "AGPL-3.0-only", "website": "https://min.io", - "admindoc": "https://yunohost.org/packaging_apps", - "userdoc": "https://yunohost.org/apps", + "admindoc": "https://docs.min.io/", "code": "https://github.com/minio/minio" }, "license": "AGPL-3.0-only", @@ -20,7 +19,7 @@ "name": "Raoul de Limezy" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ diff --git a/scripts/backup b/scripts/backup index b01124b..5843064 100755 --- a/scripts/backup +++ b/scripts/backup @@ -39,11 +39,6 @@ mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) #================================================= ynh_print_info --message="Declaring files to be backed up..." -### N.B. : the following 'ynh_backup' calls are only a *declaration* of what needs -### to be backuped and not an actual copy of any file. The actual backup that -### creates and fill the archive with the files happens in the core after this -### script is called. Hence ynh_backups calls takes basically 0 seconds to run. - #================================================= # BACKUP THE APP MAIN DIR #================================================= diff --git a/scripts/install b/scripts/install index 8a0109d..a0765f4 100755 --- a/scripts/install +++ b/scripts/install @@ -27,38 +27,16 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -#language=$YNH_APP_ARG_LANGUAGE - -### If it's a multi-instance app, meaning it can be installed several times independently -### The id of the app as stated in the manifest is available as $YNH_APP_ID -### The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2"...) -### The app instance name is available as $YNH_APP_INSTANCE_NAME -### - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample -### - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2 -### - ynhexample__{N} for the subsequent installations, with N=3,4... -### The app instance name is probably what interests you most, since this is -### guaranteed to be unique. This is a good unique identifier to define installation path, -### db names... -app=$YNH_APP_INSTANCE_NAME - -minio_id="minio" minio_key=$(ynh_string_random) +architecture=$YNH_ARCH + +app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -### About --weight and --time -### ynh_script_progression will show to your final users the progression of each scripts. -### In order to do that, --weight will represent the relative time of execution compared to the other steps in the script. -### --time is a packager option, it will show you the execution time since the previous call. -### This option should be removed before releasing your app. -### Use the execution time, given by --time, to estimate the weight of a step. -### A common way to do it is to set a weight equal to the execution time in second +1. -### The execution time is given for the duration since the previous call. So the weight should be applied to this previous call. ynh_script_progression --message="Validating installation parameters..." --time --weight=1 -### If the app uses NGINX as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app". -### If the app provides an internal web server (or uses another application server such as uWSGI), the final path should be "/opt/yunohost/$app" final_path=/opt/yunohost/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" @@ -67,10 +45,6 @@ mc_path=$final_path/mc # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url - -datadir=/home/yunohost.app/$app -test ! -e "$datadir" || ynh_die --message="This path already contains a folder" - #================================================= # STORE SETTINGS FROM MANIFEST #================================================= @@ -78,11 +52,9 @@ ynh_script_progression --message="Storing installation settings..." --time --wei ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=minio_id --value=$minio_id ynh_app_setting_set --app=$app --key=minio_key --value=$minio_key ynh_app_setting_set --app=$app --key=mc_path --value=$mc_path - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -90,11 +62,6 @@ ynh_app_setting_set --app=$app --key=mc_path --value=$mc_path #================================================= ynh_script_progression --message="Finding an available port..." --time --weight=1 -### Use these lines if you have to open a port for the application -### `ynh_find_port` will find the first available port starting from the given port. -### If you're not using these lines: -### - Remove the section "CLOSE A PORT" in the remove script - # Find an available port port=$(ynh_find_port --port=9000) ynh_app_setting_set --app=$app --key=port --value=$port @@ -103,29 +70,6 @@ ynh_app_setting_set --app=$app --key=port --value=$port console_port=$(ynh_find_port --port=36669) ynh_app_setting_set --app=$app --key=console_port --value=$console_port -# Optional: Expose this port publicly -# (N.B.: you only need to do this if the app actually needs to expose the port publicly. -# If you do this and the app doesn't actually need you are CREATING SECURITY HOLES IN THE SERVER !) - -# Open the port -# ynh_script_progression --message="Configuring firewall..." --time --weight=1 -# ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port - -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing dependencies..." --time --weight=1 - -### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package. -### Those deb packages will be installed as dependencies of this package. -### If you're not using this helper: -### - Remove the section "REMOVE DEPENDENCIES" in the remove script -### - Remove the variable "pkg_dependencies" in _common.sh -### - As well as the section "REINSTALL DEPENDENCIES" in the restore script -### - And the section "UPGRADE DEPENDENCIES" in the upgrade script - -#ynh_install_app_dependencies $pkg_dependencies - #================================================= # CREATE DEDICATED USER #================================================= @@ -139,24 +83,15 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= ynh_script_progression --message="Setting up source files..." --time --weight=1 -### `ynh_setup_source` is used to install an app from a zip or tar.gz file, -### downloaded from an upstream source, like a git repository. -### `ynh_setup_source` use the file conf/app.src - 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="$final_path" --source_id="$architecture" -# FIXME: this should be managed by the core in the future -# Here, as a packager, you may have to tweak the ownerhsip/permissions -# such that the appropriate users (e.g. maybe www-data) can access -# files in some cases. -# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder - -# this will be treated as a security issue. chmod -R 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +chmod +x "$final_path/minio" #================================================= # DOWNLOAD, CHECK AND UNPACK MINIO CLIENT @@ -165,12 +100,6 @@ ynh_script_progression --message="Setting up MinIO client..." --time --weight=1 ynh_setup_source --dest_dir="$mc_path" --source_id=mc -# FIXME: this should be managed by the core in the future -# Here, as a packager, you may have to tweak the ownerhsip/permissions -# such that the appropriate users (e.g. maybe www-data) can access -# files in some cases. -# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder - -# this will be treated as a security issue. chmod -R 750 "$mc_path" chmod -R o-rwx "$mc_path" chown -R $app:www-data "$mc_path" @@ -180,29 +109,15 @@ chown -R $app:www-data "$mc_path" #================================================= ynh_script_progression --message="Configuring NGINX web server..." --time --weight=1 -### `ynh_add_nginx_config` will use the file conf/nginx.conf - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# SPECIFIC SETUP -#================================================= -# ... -#================================================= - #================================================= # CREATE DATA DIRECTORY #================================================= ynh_script_progression --message="Creating a data directory..." --time --weight=1 -### Use these lines if you need to create a directory to store "persistent files" for the application. -### Usually this directory is used to store uploaded files or any file that won't be updated during -### an upgrade and that won't be deleted during app removal -### If you're not using these lines: -### - Remove the section "BACKUP THE DATA DIR" in the backup script -### - As well as the section "RESTORE THE DATA DIRECTORY" in the restore script - +datadir=/home/yunohost.app/$app ynh_app_setting_set --app=$app --key=datadir --value=$datadir mkdir -p $datadir @@ -227,73 +142,14 @@ ynh_add_config --template="../conf/.env" --destination="$final_path/.env" chmod 750 "$final_path/.env" chown $app:$app "$final_path/.env" -### You can add specific configuration files. -### -### Typically, put your template conf file in ../conf/your_config_file -### The template may contain strings such as __FOO__ or __FOO_BAR__, -### which will automatically be replaced by the values of $foo and $foo_bar -### -### ynh_add_config will also keep track of the config file's checksum, -### which later during upgrade may allow to automatically backup the config file -### if it's found that the file was manually modified -### -### Check the documentation of `ynh_add_config` for more info. - -#ynh_add_config --template="some_config_file" --destination="$final_path/some_config_file" - -# FIXME: this should be handled by the core in the future -# You may need to use chmod 600 instead of 400, -# for example if the app is expected to be able to modify its own config -#chmod 400 "$final_path/some_config_file" -#chown $app:$app "$final_path/some_config_file" - -### For more complex cases where you want to replace stuff using regexes, -### you shoud rely on ynh_replace_string (which is basically a wrapper for sed) -### When doing so, you also need to manually call ynh_store_file_checksum -### -### ynh_replace_string --match_string="match_string" --replace_string="replace_string" --target_file="$final_path/some_config_file" -### ynh_store_file_checksum --file="$final_path/some_config_file" - #================================================= # SETUP SYSTEMD #================================================= ynh_script_progression --message="Configuring a systemd service..." --time --weight=1 -### `ynh_systemd_config` is used to configure a systemd script for an app. -### It can be used for apps that use sysvinit (with adaptation) or systemd. -### Have a look at the app to be sure this app needs a systemd script. -### `ynh_systemd_config` will use the file conf/systemd.service -### If you're not using these lines: -### - You can remove those files in conf/. -### - Remove the section "BACKUP SYSTEMD" in the backup script -### - Remove also the section "STOP AND REMOVE SERVICE" in the remove script -### - As well as the section "RESTORE SYSTEMD" in the restore script -### - And the section "SETUP SYSTEMD" in the upgrade script - # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# SETUP APPLICATION WITH CURL -#================================================= - -### Use these lines only if the app installation needs to be finalized through -### web forms. We generally don't want to ask the final user, -### so we're going to use curl to automatically fill the fields and submit the -### forms. - -# Set the app as temporarily public for curl call -#ynh_script_progression --message="Configuring SSOwat..." --time --weight=1 -# Making the app public for curl -#ynh_permission_update --permission="main" --add="visitors" - -# Installation with curl -#ynh_script_progression --message="Finalizing installation..." --time --weight=1 -#ynh_local_curl "/INSTALL_PATH" "key1=value1" "key2=value2" "key3=value3" - -# Remove the public access -#ynh_permission_update --permission="main" --remove="visitors" - #================================================= # GENERIC FINALIZATION #================================================= @@ -301,14 +157,6 @@ ynh_add_systemd_config #================================================= ynh_script_progression --message="Configuring log rotation..." --time --weight=1 -### `ynh_use_logrotate` is used to configure a logrotate configuration for the logs of this app. -### Use this helper only if there is effectively a log file for this app. -### If you're not using this helper: -### - Remove the section "BACKUP LOGROTATE" in the backup script -### - Remove also the section "REMOVE LOGROTATE CONFIGURATION" in the remove script -### - As well as the section "RESTORE THE LOGROTATE CONFIGURATION" in the restore script -### - And the section "SETUP LOGROTATE" in the upgrade script - # Use logrotate to manage application logfile(s) ynh_use_logrotate @@ -317,57 +165,16 @@ ynh_use_logrotate #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 -### `yunohost service add` integrates a service in YunoHost. It then gets -### displayed in the admin interface and through the others `yunohost service` commands. -### (N.B.: this line only makes sense if the app adds a service to the system!) -### If you're not using these lines: -### - You can remove these files in conf/. -### - Remove the section "REMOVE SERVICE INTEGRATION IN YUNOHOST" in the remove script -### - As well as the section "INTEGRATE SERVICE IN YUNOHOST" in the restore script -### - And the section "INTEGRATE SERVICE IN YUNOHOST" in the upgrade script - yunohost service add $app --description="A High Performance, Kubernetes Native Object Storage" --log="/var/log/$app/$app.log" -### Additional options starting with 3.8: -### -### --needs_exposed_ports "$port" a list of ports that needs to be publicly exposed -### which will then be checked by YunoHost's diagnosis system -### (N.B. DO NOT USE THIS is the port is only internal!!!) -### -### --test_status "some command" a custom command to check the status of the service -### (only relevant if 'systemctl status' doesn't do a good job) -### -### --test_conf "some command" some command similar to "nginx -t" that validates the conf of the service -### -### Re-calling 'yunohost service add' during the upgrade script is the right way -### to proceed if you later realize that you need to enable some flags that -### weren't enabled on old installs (be careful it'll override the existing -### service though so you should re-provide all relevant flags when doing so) - #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --time --weight=1 -### `ynh_systemd_action` is used to start a systemd service for an app. -### Only needed if you have configure a systemd service -### If you're not using these lines: -### - Remove the section "STOP SYSTEMD SERVICE" and "START SYSTEMD SERVICE" in the backup script -### - As well as the section "START SYSTEMD SERVICE" in the restore script -### - As well as the section"STOP SYSTEMD SERVICE" and "START SYSTEMD SERVICE" in the upgrade script -### - And the section "STOP SYSTEMD SERVICE" and "START SYSTEMD SERVICE" in the change_url script - # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -#================================================= -# SETUP FAIL2BAN -#================================================= -#ynh_script_progression --message="Configuring Fail2Ban..." --time --weight=1 - -# Create a dedicated Fail2Ban config -#ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" - #================================================= # SETUP SSOWAT #================================================= @@ -376,22 +183,9 @@ ynh_script_progression --message="Configuring permissions..." --time --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. ynh_permission_update --permission="main" --add="visitors" fi -### N.B. : the following extra permissions only make sense if your app -### does have for example an admin interface or an API. - -# Only the admin can access the admin panel of the app (if the app has an admin panel) -#ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin - -# Everyone can access the API part -# We don't want to display the tile in the SSO so we put --show_tile="false" -# And we don't want the YunoHost admin to be able to remove visitors group to this permission, so we put --protected="true" -#ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" - #================================================= # RELOAD NGINX #================================================= @@ -407,7 +201,7 @@ sleep 5 ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 pushd $mc_path - ynh_exec_warn_less sudo -u minio ./mc alias set minio "https://$domain" "$minio_id" "$minio_key" + ynh_exec_warn_less sudo -u minio ./mc alias set minio "https://$domain" "$app" "$minio_key" popd #================================================= diff --git a/scripts/remove b/scripts/remove index 3d7b7af..c791d5c 100755 --- a/scripts/remove +++ b/scripts/remove @@ -58,7 +58,17 @@ ynh_script_progression --message="Removing app main directory..." --time --weigh # Remove the app directory securely ynh_secure_remove --file="$final_path" -ynh_secure_remove --file="$datadir" + +#================================================= +# REMOVE DATA DIR +#================================================= + +# Remove the data directory if --purge option is used +if [ "${YNH_APP_PURGE:-0}" -eq 1 ] +then + ynh_script_progression --message="Removing app data directory..." --time --weight=1 + ynh_secure_remove --file="$datadir" +fi #================================================= # REMOVE NGINX CONFIGURATION @@ -68,30 +78,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# CLOSE A PORT -#================================================= - -if yunohost firewall list | grep -q "\- $port$" -then - ynh_script_progression --message="Closing port $port..." --time --weight=1 - ynh_exec_warn_less yunohost firewall disallow TCP $port -fi - -if yunohost firewall list | grep -q "\- $console_port$" -then - ynh_script_progression --message="Closing port $console_port..." --time --weight=1 - ynh_exec_warn_less yunohost firewall disallow TCP $port -fi - -#================================================= -# REMOVE FAIL2BAN CONFIGURATION -#================================================= -ynh_script_progression --message="Removing Fail2ban configuration..." --time --weight=1 - -# Remove the dedicated Fail2Ban config -ynh_remove_fail2ban_config - #================================================= # SPECIFIC REMOVE #================================================= diff --git a/scripts/restore b/scripts/restore index d960d38..ef1f884 100755 --- a/scripts/restore +++ b/scripts/restore @@ -34,7 +34,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) datadir=$(ynh_app_setting_get --app=$app --key=datadir) mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) - #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= @@ -67,15 +66,10 @@ ynh_script_progression --message="Restoring the app main directory..." --time -- ynh_restore_file --origin_path="$final_path" -# FIXME: this should be managed by the core in the future -# Here, as a packager, you may have to tweak the ownerhsip/permissions -# such that the appropriate users (e.g. maybe www-data) can access -# files in some cases. -# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder - -# this will be treated as a security issue. chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:$app "$final_path" +chmod +x "$final_path/minio" #================================================= # RESTORE THE DATA DIRECTORY @@ -86,25 +80,10 @@ ynh_restore_file --origin_path="$datadir" --not_mandatory mkdir -p $datadir -# FIXME: this should be managed by the core in the future -# Here, as a packager, you may have to tweak the ownerhsip/permissions -# such that the appropriate users (e.g. maybe www-data) can access -# files in some cases. -# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder - -# this will be treated as a security issue. chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" -#================================================= -# RESTORE FAIL2BAN CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the Fail2Ban configuration..." --time --weight=1 - -ynh_restore_file "/etc/fail2ban/jail.d/$app.conf" -ynh_restore_file "/etc/fail2ban/filter.d/$app.conf" -ynh_systemd_action --action=restart --service_name=fail2ban - #================================================= # RESTORE SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 05e0362..ca9bf7f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,20 +20,13 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -minio_id=$(ynh_app_setting_get --app=$app --key=minio_id) minio_key=$(ynh_app_setting_get --app=$app --key=minio_key) - +architecture=$YNH_ARCH #================================================= # CHECK VERSION #================================================= -### This helper will compare the version of the currently installed app and the version of the upstream package. -### $upgrade_type can have 2 different values -### - UPGRADE_APP if the upstream app version has changed -### - UPGRADE_PACKAGE if only the YunoHost package has changed -### ynh_check_app_version_changed will stop the upgrade if the app is up to date. -### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do. upgrade_type=$(ynh_check_app_version_changed) #================================================= @@ -76,18 +69,13 @@ then ynh_script_progression --message="Upgrading source files..." --time --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" fi -# FIXME: this should be managed by the core in the future -# Here, as a packager, you may have to tweak the ownerhsip/permissions -# such that the appropriate users (e.g. maybe www-data) can access -# files in some cases. -# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder - -# this will be treated as a security issue. chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:$app "$final_path" +chmod +x "$final_path/minio" #================================================= # NGINX CONFIGURATION @@ -146,14 +134,6 @@ ynh_script_progression --message="Starting a systemd service..." --time --weight ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" -#================================================= -# UPGRADE FAIL2BAN -#================================================= -ynh_script_progression --message="Reconfiguring Fail2Ban..." --time --weight=1 - -# Create a dedicated Fail2Ban config -ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login" - #================================================= # RELOAD NGINX #================================================= From 235e5d7a1732cef1145cc5d21d7448677270f221 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 30 Jan 2022 14:41:42 +0000 Subject: [PATCH 078/104] Auto-update README --- README.md | 5 ++--- README_fr.md | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 20c5cc3..bffefc1 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol - Excepteur sint occaecat cupidatat non proident, sunt in culpa." -**Shipped version:** 2021-11-05T09-16-26Z~ynh1 +**Shipped version:** 2022.01.28~ynh1 @@ -52,8 +52,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol ## Documentation and resources * Official app website: https://min.io -* Official user documentation: https://yunohost.org/apps -* Official admin documentation: https://yunohost.org/packaging_apps +* Official admin documentation: https://docs.min.io/ * Upstream app code repository: https://github.com/minio/minio * YunoHost documentation for this app: https://yunohost.org/app_minio * Report a bug: https://github.com/YunoHost-Apps/minio_ynh/issues diff --git a/README_fr.md b/README_fr.md index 10f65f1..3f90e14 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol - Excepteur sint occaecat cupidatat non proident, sunt in culpa." -**Version incluse :** 2021-11-05T09-16-26Z~ynh1 +**Version incluse :** 2022.01.28~ynh1 @@ -48,8 +48,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol ## Documentations et ressources * Site officiel de l'app : https://min.io -* Documentation officielle utilisateur : https://yunohost.org/apps -* Documentation officielle de l'admin : https://yunohost.org/packaging_apps +* Documentation officielle de l'admin : https://docs.min.io/ * Dépôt de code officiel de l'app : https://github.com/minio/minio * Documentation YunoHost pour cette app : https://yunohost.org/app_minio * Signaler un bug : https://github.com/YunoHost-Apps/minio_ynh/issues From c033754d08b4e82b30a84733dafa8df5d46dc2e9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 15:45:39 +0100 Subject: [PATCH 079/104] Update install --- scripts/install | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index a0765f4..97c7bde 100755 --- a/scripts/install +++ b/scripts/install @@ -98,11 +98,12 @@ chmod +x "$final_path/minio" #================================================= ynh_script_progression --message="Setting up MinIO client..." --time --weight=1 -ynh_setup_source --dest_dir="$mc_path" --source_id=mc +ynh_setup_source --dest_dir="$mc_path" --source_id="mc" chmod -R 750 "$mc_path" chmod -R o-rwx "$mc_path" chown -R $app:www-data "$mc_path" +chmod +x $mc_path/mc #================================================= # NGINX CONFIGURATION @@ -122,12 +123,6 @@ ynh_app_setting_set --app=$app --key=datadir --value=$datadir mkdir -p $datadir -# FIXME: this should be managed by the core in the future -# Here, as a packager, you may have to tweak the ownerhsip/permissions -# such that the appropriate users (e.g. maybe www-data) can access -# files in some cases. -# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder - -# this will be treated as a security issue. chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" @@ -201,7 +196,7 @@ sleep 5 ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 pushd $mc_path - ynh_exec_warn_less sudo -u minio ./mc alias set minio "https://$domain" "$app" "$minio_key" + ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain" "$app" "$minio_key" popd #================================================= From eefd7182d74f143becd7f5b361d0c61f83d342b6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 15:47:46 +0100 Subject: [PATCH 080/104] Add screenshot --- doc/screenshots/example.jpg | Bin 35451 -> 0 bytes doc/screenshots/minio-browser.jpg | Bin 0 -> 103912 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 doc/screenshots/example.jpg create mode 100644 doc/screenshots/minio-browser.jpg diff --git a/doc/screenshots/example.jpg b/doc/screenshots/example.jpg deleted file mode 100644 index a1efa1a36d593384df59dc13db03fa83b0436d69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35451 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 UE-)&$xd9C0IsX9d#{5|Pe`qLcKmY&$ diff --git a/doc/screenshots/minio-browser.jpg b/doc/screenshots/minio-browser.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9fb2289d5f9e5a60b2697c9ec8454a26d977c9dd GIT binary patch literal 103912 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 y1+A3iUHmch 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 <3f`c!*S#dW9uAMc`dj{=EoD+?o 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

uz2)j6aW!G4_2jfw!LNZKv9| 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 literal 0 HcmV?d00001 From 563e02d0c7fcbc15e87ef0b1c36256e2e852feea Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 30 Jan 2022 14:47:53 +0000 Subject: [PATCH 081/104] 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 bffefc1..fb1324a 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol ## Screenshots -![](./doc/screenshots/example.jpg) +![](./doc/screenshots/minio-browser.jpg) ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 3f90e14..dfe0eb4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Some long and extensive description of what the app is and does, lorem ipsum dol ## Captures d'écran -![](./doc/screenshots/example.jpg) +![](./doc/screenshots/minio-browser.jpg) ## Avertissements / informations importantes From 6af9011e1ca20b5011d6990f118648e2130c5784 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 16:06:25 +0100 Subject: [PATCH 082/104] Fix --- conf/.env | 5 ++++- scripts/install | 18 +++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/conf/.env b/conf/.env index 3b881ee..0f72d24 100644 --- a/conf/.env +++ b/conf/.env @@ -1,4 +1,7 @@ MINIO_ROOT_USER=__APP__ MINIO_VOLUMES="__DATADIR__/" MINIO_OPTS="-C __FINAL_PATH__/ --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" -MINIO_ROOT_PASSWORD=__MINIO_KEY__ \ No newline at end of file +MINIO_ROOT_PASSWORD=__MINIO_KEY__ + +MINIO_ETCD_CLIENT_CERT="/etc/yunohost/certs/__DOMAIN__/crt.pem" +MINIO_ETCD_CLIENT_CERT_KEY="/etc/yunohost/certs/__DOMAIN__/key.pem" \ No newline at end of file diff --git a/scripts/install b/scripts/install index 97c7bde..bb23a50 100755 --- a/scripts/install +++ b/scripts/install @@ -60,7 +60,7 @@ ynh_app_setting_set --app=$app --key=mc_path --value=$mc_path #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Finding an available port..." --time --weight=1 +ynh_script_progression --message="Finding an available port..." --weight=1 # Find an available port port=$(ynh_find_port --port=9000) @@ -73,7 +73,7 @@ ynh_app_setting_set --app=$app --key=console_port --value=$console_port #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Configuring system user..." --time --weight=1 +ynh_script_progression --message="Configuring system user..." --weight=1 # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" @@ -81,7 +81,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --time --weight=1 +ynh_script_progression --message="Setting up source files..." --weight=10 ynh_app_setting_set --app=$app --key=final_path --value=$final_path @@ -108,7 +108,7 @@ chmod +x $mc_path/mc #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --time --weight=1 +ynh_script_progression --message="Configuring NGINX web server..." --weight=4 # Create a dedicated NGINX config ynh_add_nginx_config @@ -116,7 +116,7 @@ ynh_add_nginx_config #================================================= # CREATE DATA DIRECTORY #================================================= -ynh_script_progression --message="Creating a data directory..." --time --weight=1 +ynh_script_progression --message="Creating a data directory..." --weight=1 datadir=/home/yunohost.app/$app ynh_app_setting_set --app=$app --key=datadir --value=$datadir @@ -130,7 +130,7 @@ chown -R $app:www-data "$datadir" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --time --weight=1 +ynh_script_progression --message="Adding a configuration file..." --weight=1 ynh_add_config --template="../conf/.env" --destination="$final_path/.env" @@ -140,7 +140,7 @@ chown $app:$app "$final_path/.env" #================================================= # SETUP SYSTEMD #================================================= -ynh_script_progression --message="Configuring a systemd service..." --time --weight=1 +ynh_script_progression --message="Configuring a systemd service..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config @@ -150,7 +150,7 @@ ynh_add_systemd_config #================================================= # SETUP LOGROTATE #================================================= -ynh_script_progression --message="Configuring log rotation..." --time --weight=1 +ynh_script_progression --message="Configuring log rotation..." --weight=1 # Use logrotate to manage application logfile(s) ynh_use_logrotate @@ -158,7 +158,7 @@ ynh_use_logrotate #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add $app --description="A High Performance, Kubernetes Native Object Storage" --log="/var/log/$app/$app.log" From 366a34ed3dbac31856c1c9adaf50dcada07ce57e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 16:14:42 +0100 Subject: [PATCH 083/104] Update install --- scripts/install | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/install b/scripts/install index bb23a50..cf7f501 100755 --- a/scripts/install +++ b/scripts/install @@ -96,14 +96,14 @@ chmod +x "$final_path/minio" #================================================= # DOWNLOAD, CHECK AND UNPACK MINIO CLIENT #================================================= -ynh_script_progression --message="Setting up MinIO client..." --time --weight=1 +# ynh_script_progression --message="Setting up MinIO client..." --time --weight=1 -ynh_setup_source --dest_dir="$mc_path" --source_id="mc" +# ynh_setup_source --dest_dir="$mc_path" --source_id="mc" -chmod -R 750 "$mc_path" -chmod -R o-rwx "$mc_path" -chown -R $app:www-data "$mc_path" -chmod +x $mc_path/mc +# chmod -R 750 "$mc_path" +# chmod -R o-rwx "$mc_path" +# chown -R $app:www-data "$mc_path" +# chmod +x $mc_path/mc #================================================= # NGINX CONFIGURATION @@ -118,7 +118,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Creating a data directory..." --weight=1 -datadir=/home/yunohost.app/$app +datadir="/home/yunohost.app/$app" ynh_app_setting_set --app=$app --key=datadir --value=$datadir mkdir -p $datadir @@ -193,11 +193,11 @@ sleep 5 #================================================= # SETUP MINIO CLIENT #================================================= -ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 +# ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 -pushd $mc_path - ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain" "$app" "$minio_key" -popd +# pushd $mc_path +# ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain" "$app" "$minio_key" +# popd #================================================= # END OF SCRIPT From 1720b5ae1e18773b8a94ac51ea1bcb38b5168aab Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 16:28:10 +0100 Subject: [PATCH 084/104] Fix --- scripts/change_url | 9 ++------- scripts/install | 22 ++++++++++------------ scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 495b7eb..6721178 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -29,11 +29,6 @@ ynh_script_progression --message="Loading installation settings..." --time --wei # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -# Add settings here as needed by your application -#db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#db_user=$db_name -#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) - #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= @@ -74,7 +69,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --time --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF @@ -118,7 +113,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --time --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index cf7f501..2dd1834 100755 --- a/scripts/install +++ b/scripts/install @@ -35,9 +35,9 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." --time --weight=1 +ynh_script_progression --message="Validating installation parameters..." --weight=1 -final_path=/opt/yunohost/$app +final_path="/opt/yunohost/$app" test ! -e "$final_path" || ynh_die --message="This path already contains a folder" mc_path=$final_path/mc @@ -48,7 +48,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --time --weight=1 +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 @@ -96,7 +96,7 @@ chmod +x "$final_path/minio" #================================================= # DOWNLOAD, CHECK AND UNPACK MINIO CLIENT #================================================= -# ynh_script_progression --message="Setting up MinIO client..." --time --weight=1 +# ynh_script_progression --message="Setting up MinIO client..." --weight=1 # ynh_setup_source --dest_dir="$mc_path" --source_id="mc" @@ -165,15 +165,15 @@ yunohost service add $app --description="A High Performance, Kubernetes Native O #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." --time --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] @@ -184,16 +184,14 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload -sleep 5 - #================================================= # SETUP MINIO CLIENT #================================================= -# ynh_script_progression --message="Configuring MinIO client..." --time --weight=1 +# ynh_script_progression --message="Configuring MinIO client..." --weight=1 # pushd $mc_path # ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain" "$app" "$minio_key" @@ -203,4 +201,4 @@ sleep 5 # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --time --last \ No newline at end of file +ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/restore b/scripts/restore index ef1f884..4846a4e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -118,7 +118,7 @@ yunohost service add $app --description="A High Performance, Kubernetes Native O #================================================= ynh_script_progression --message="Starting a systemd service..." --time --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index ca9bf7f..5d15b7f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -132,7 +132,7 @@ yunohost service add $app --description="A High Performance, Kubernetes Native O #================================================= ynh_script_progression --message="Starting a systemd service..." --time --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # RELOAD NGINX From 0d59c7a8c2801d67dcb29702186663f3a81ab0bf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 16:38:06 +0100 Subject: [PATCH 085/104] Fix --- conf/.env | 2 +- conf/systemd.service | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/conf/.env b/conf/.env index 0f72d24..1121786 100644 --- a/conf/.env +++ b/conf/.env @@ -1,6 +1,6 @@ MINIO_ROOT_USER=__APP__ MINIO_VOLUMES="__DATADIR__/" -MINIO_OPTS="-C __FINAL_PATH__/ --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" +MINIO_OPTS="-C __FINAL_PATH__/minio --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" MINIO_ROOT_PASSWORD=__MINIO_KEY__ MINIO_ETCD_CLIENT_CERT="/etc/yunohost/certs/__DOMAIN__/crt.pem" diff --git a/conf/systemd.service b/conf/systemd.service index 65b39ab..a349b45 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,16 +1,30 @@ [Unit] -Description=A High Performance, Kubernetes Native Object Storage -After=network.target +Description=MinIO +Documentation=https://docs.min.io +Wants=network-online.target +After=network-online.target +AssertFileIsExecutable=__FINALPATH__/minio [Service] Type=simple User=__APP__ Group=__APP__ +ProtectProc=invisible WorkingDirectory=__FINAL_PATH__/ EnvironmentFile=__FINAL_PATH__/.env ExecStart=__FINALPATH__/minio server $MINIO_OPTS $MINIO_VOLUMES -StandardOutput=append:/var/log/__APP__/__APP__.log -StandardError=inherit +# Let systemd restart this service always +Restart=always + +# Specifies the maximum file descriptor number that can be opened by this process +LimitNOFILE=1048576 + +# Specifies the maximum number of threads this process can create +TasksMax=infinity + +# Disable timeout logic and wait until process is stopped +TimeoutStopSec=infinity +SendSIGKILL=no [Install] WantedBy=multi-user.target From 00ef019bef876295221515ae08c794953e7f2f1e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 17:18:09 +0100 Subject: [PATCH 086/104] Update .env --- conf/.env | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/.env b/conf/.env index 1121786..f287be0 100644 --- a/conf/.env +++ b/conf/.env @@ -1,7 +1,4 @@ MINIO_ROOT_USER=__APP__ MINIO_VOLUMES="__DATADIR__/" -MINIO_OPTS="-C __FINAL_PATH__/minio --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" +MINIO_OPTS="-C __FINAL_PATH__/ --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" MINIO_ROOT_PASSWORD=__MINIO_KEY__ - -MINIO_ETCD_CLIENT_CERT="/etc/yunohost/certs/__DOMAIN__/crt.pem" -MINIO_ETCD_CLIENT_CERT_KEY="/etc/yunohost/certs/__DOMAIN__/key.pem" \ No newline at end of file From 27847bbc91cc8b667bbdfbc0996ff940d716b522 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 17:29:51 +0100 Subject: [PATCH 087/104] Fix --- conf/.env | 2 ++ scripts/install | 2 ++ 2 files changed, 4 insertions(+) diff --git a/conf/.env b/conf/.env index f287be0..0719fb4 100644 --- a/conf/.env +++ b/conf/.env @@ -2,3 +2,5 @@ MINIO_ROOT_USER=__APP__ MINIO_VOLUMES="__DATADIR__/" MINIO_OPTS="-C __FINAL_PATH__/ --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" MINIO_ROOT_PASSWORD=__MINIO_KEY__ +MINIO_ACCESS_KEY="__MINIO_ACCESS_KEY__" +MINIO_SECRET_KEY="__MINIO_SECRET_KEY__" \ No newline at end of file diff --git a/scripts/install b/scripts/install index 2dd1834..99c9122 100755 --- a/scripts/install +++ b/scripts/install @@ -29,6 +29,8 @@ path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC minio_key=$(ynh_string_random) architecture=$YNH_ARCH +minio-access-key=$(ynh_string_random --length=10) +minio-secret-key=$(ynh_string_random --length=32) app=$YNH_APP_INSTANCE_NAME From 16c86aaebd03d49fcc649ba9b901fbf801c3cc2e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 17:30:50 +0100 Subject: [PATCH 088/104] Update remove --- scripts/remove | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/remove b/scripts/remove index c791d5c..980fd3b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -31,14 +31,14 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service integration..." --time --weight=1 + ynh_script_progression --message="Removing $app service integration..." --weight=3 yunohost service remove $app fi #================================================= # STOP AND REMOVE SERVICE #================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --time --weight=1 +ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1 # Remove the dedicated systemd config ynh_remove_systemd_config @@ -46,7 +46,7 @@ ynh_remove_systemd_config #================================================= # REMOVE LOGROTATE CONFIGURATION #================================================= -ynh_script_progression --message="Removing logrotate configuration..." --time --weight=1 +ynh_script_progression --message="Removing logrotate configuration..." --weight=1 # Remove the app-specific logrotate config ynh_remove_logrotate @@ -54,7 +54,7 @@ ynh_remove_logrotate #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --time --weight=1 +ynh_script_progression --message="Removing app main directory..." --weight=3 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -66,14 +66,14 @@ ynh_secure_remove --file="$final_path" # Remove the data directory if --purge option is used if [ "${YNH_APP_PURGE:-0}" -eq 1 ] then - ynh_script_progression --message="Removing app data directory..." --time --weight=1 + ynh_script_progression --message="Removing app data directory..." --weight=1 ynh_secure_remove --file="$datadir" fi #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config @@ -93,7 +93,7 @@ ynh_secure_remove --file="/var/log/$app" #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1 +ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user ynh_system_user_delete --username=$app @@ -102,4 +102,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --time --last +ynh_script_progression --message="Removal of $app completed" --last From d6469991788c92b33d95d86d8bc86159a5a8239d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 17:32:52 +0100 Subject: [PATCH 089/104] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 99c9122..45e36c2 100755 --- a/scripts/install +++ b/scripts/install @@ -29,8 +29,8 @@ path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC minio_key=$(ynh_string_random) architecture=$YNH_ARCH -minio-access-key=$(ynh_string_random --length=10) -minio-secret-key=$(ynh_string_random --length=32) +minio_access_key=$(ynh_string_random --length=10) +minio_secret_key=$(ynh_string_random --length=32) app=$YNH_APP_INSTANCE_NAME From 39a1b772ad66fc4f83a8a4d45384a40f0caf1be4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 17:38:52 +0100 Subject: [PATCH 090/104] Update .env --- conf/.env | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/.env b/conf/.env index 0719fb4..8ea98a5 100644 --- a/conf/.env +++ b/conf/.env @@ -1,6 +1,4 @@ MINIO_ROOT_USER=__APP__ +MINIO_ROOT_PASSWORD=__MINIO_KEY__ MINIO_VOLUMES="__DATADIR__/" MINIO_OPTS="-C __FINAL_PATH__/ --address 127.0.0.1:__PORT__ --console-address :__CONSOLE_PORT__" -MINIO_ROOT_PASSWORD=__MINIO_KEY__ -MINIO_ACCESS_KEY="__MINIO_ACCESS_KEY__" -MINIO_SECRET_KEY="__MINIO_SECRET_KEY__" \ No newline at end of file From 8a473652598f51ad3c4d8fe165c12f79bad3e192 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 17:39:08 +0100 Subject: [PATCH 091/104] Update install --- scripts/install | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index 45e36c2..2dd1834 100755 --- a/scripts/install +++ b/scripts/install @@ -29,8 +29,6 @@ path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC minio_key=$(ynh_string_random) architecture=$YNH_ARCH -minio_access_key=$(ynh_string_random --length=10) -minio_secret_key=$(ynh_string_random --length=32) app=$YNH_APP_INSTANCE_NAME From 6eb7eb76eff4c788cf3cd22547b53235443cb30b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 18:00:27 +0100 Subject: [PATCH 092/104] Update nginx.conf --- conf/nginx.conf | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 10b366e..7eb5665 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,15 +1,15 @@ location / { - proxy_pass http://127.0.0.1:__PORT__; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - client_max_body_size 200M; - + proxy_pass http://127.0.0.1:__PORT__/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; + proxy_cache_bypass $http_upgrade; + proxy_ignore_client_abort on; + + # forward headers + proxy_buffering off; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; } From 78da15c902bcfb67351517e387ce0d5f522c8292 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 18:09:29 +0100 Subject: [PATCH 093/104] Update install --- scripts/install | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index 2dd1834..7b8bacb 100755 --- a/scripts/install +++ b/scripts/install @@ -96,14 +96,14 @@ chmod +x "$final_path/minio" #================================================= # DOWNLOAD, CHECK AND UNPACK MINIO CLIENT #================================================= -# ynh_script_progression --message="Setting up MinIO client..." --weight=1 +ynh_script_progression --message="Setting up MinIO client..." --weight=1 -# ynh_setup_source --dest_dir="$mc_path" --source_id="mc" +ynh_setup_source --dest_dir="$mc_path" --source_id="mc" -# chmod -R 750 "$mc_path" -# chmod -R o-rwx "$mc_path" -# chown -R $app:www-data "$mc_path" -# chmod +x $mc_path/mc +chmod -R 750 "$mc_path" +chmod -R o-rwx "$mc_path" +chown -R $app:www-data "$mc_path" +chmod +x $mc_path/mc #================================================= # NGINX CONFIGURATION @@ -191,11 +191,11 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= # SETUP MINIO CLIENT #================================================= -# ynh_script_progression --message="Configuring MinIO client..." --weight=1 +ynh_script_progression --message="Configuring MinIO client..." --weight=1 -# pushd $mc_path -# ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain" "$app" "$minio_key" -# popd +pushd $mc_path + ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain" "$app" "$minio_key" --api S3v4 +popd #================================================= # END OF SCRIPT From 7d4a02fe2c03cabe438aca8bf48da239e417425c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jan 2022 18:30:24 +0100 Subject: [PATCH 094/104] Update mc.src --- conf/mc.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/mc.src b/conf/mc.src index 3114d22..a63639d 100644 --- a/conf/mc.src +++ b/conf/mc.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2021-11-05T10-05-06Z -SOURCE_SUM=9f5ad72fd93678f9f756c6da34a8d4d1e61f7356a96ee327c652ad765975d2b2 +SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2022-01-29T01-03-27Z +SOURCE_SUM=6bad19afdd2846986c8893935cde4b3f8ea03591575c930b4790602ee03e196c SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mc From b556fa0a26ae5e2e3fc3f0cbcd5841b2325223c8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Feb 2022 08:32:24 +0100 Subject: [PATCH 095/104] Fix --- conf/amd64.src | 2 +- conf/arm64.src | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index ae7431b..93574a5 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ SOURCE_URL=https://dl.min.io/server/minio/release/linux-amd64/minio -SOURCE_SUM=d81f52faf6f0626fa4b23964c403bae60ff840577f4d75ec3e208ceb78f19ee2 +SOURCE_SUM=d68470a516706a81f7bef664f2fd8637bf316049262aa6da7f085d1425dda815 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=minio diff --git a/conf/arm64.src b/conf/arm64.src index ae7431b..d8e9cce 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/server/minio/release/linux-amd64/minio -SOURCE_SUM=d81f52faf6f0626fa4b23964c403bae60ff840577f4d75ec3e208ceb78f19ee2 +SOURCE_URL=https://dl.min.io/server/minio/release/linux-arm64/minio +SOURCE_SUM=a1c895afc59d7487a61beb3ce0ff1cdf13d00a3fdd001a2af35453ba2149733d SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=minio From 43e73ff73b944485c47331833e4fe4e964ecf7bd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Feb 2022 09:37:48 +0100 Subject: [PATCH 096/104] Update backup --- scripts/backup | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/scripts/backup b/scripts/backup index 5843064..f4db696 100755 --- a/scripts/backup +++ b/scripts/backup @@ -57,13 +57,6 @@ ynh_backup --src_path="$datadir" --is_big ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP FAIL2BAN CONFIGURATION -#================================================= - -ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" -ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" - #================================================= # SPECIFIC BACKUP #================================================= @@ -72,12 +65,6 @@ ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" ynh_backup --src_path="/etc/logrotate.d/$app" -#================================================= -# BACKUP LOGS -#================================================= - -ynh_backup --src_path="/var/log/$app/$app.log" - #================================================= # BACKUP SYSTEMD #================================================= From d00a8bec04166b93954bd3476791b3e6ccdf9dfd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Feb 2022 09:41:07 +0100 Subject: [PATCH 097/104] Fix --- scripts/install | 6 +++--- scripts/upgrade | 44 ++++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scripts/install b/scripts/install index 7b8bacb..60ac59a 100755 --- a/scripts/install +++ b/scripts/install @@ -130,7 +130,7 @@ chown -R $app:www-data "$datadir" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +ynh_script_progression --message="Adding a configuration file..." --weight=2 ynh_add_config --template="../conf/.env" --destination="$final_path/.env" @@ -158,14 +158,14 @@ ynh_use_logrotate #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 yunohost service add $app --description="A High Performance, Kubernetes Native Object Storage" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=3 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" diff --git a/scripts/upgrade b/scripts/upgrade index 5d15b7f..7945f56 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -32,7 +32,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -48,14 +48,14 @@ ynh_abort_if_errors #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --time --weight=1 +ynh_script_progression --message="Stopping a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1 +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" @@ -66,10 +66,10 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --time --weight=1 + ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" + ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" --keep="$final_path/.env" fi chmod 750 "$final_path" @@ -80,7 +80,7 @@ chmod +x "$final_path/minio" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config @@ -88,24 +88,24 @@ ynh_add_nginx_config #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --time --weight=1 +ynh_script_progression --message="Upgrading dependencies..." --weight=5 ynh_install_app_dependencies $pkg_dependencies -#================================================= -# ADD A CONFIGURATION -#================================================= -ynh_script_progression --message="Adding a configuration file..." --time --weight=1 +# #================================================= +# # ADD A CONFIGURATION +# #================================================= +# ynh_script_progression --message="Adding a configuration file..." --weight=2 -ynh_add_config --template="../conf/.env" --destination="$final_path/.env" +# ynh_add_config --template="../conf/.env" --destination="$final_path/.env" -chmod 750 "$final_path/.env" -chown $app:$app "$final_path/.env" +# chmod 750 "$final_path/.env" +# chown $app:$app "$final_path/.env" #================================================= # SETUP SYSTEMD #================================================= -ynh_script_progression --message="Upgrading systemd configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config @@ -115,7 +115,7 @@ ynh_add_systemd_config #================================================= # SETUP LOGROTATE #================================================= -ynh_script_progression --message="Upgrading logrotate configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1 # Use logrotate to manage app-specific logfile(s) ynh_use_logrotate --non-append @@ -123,21 +123,21 @@ ynh_use_logrotate --non-append #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add $app --description="A High Performance, Kubernetes Native Object Storage" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=3 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -145,4 +145,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --time --last +ynh_script_progression --message="Upgrade of $app completed" --last From 8d3f9f2b410ff88628388487e661fd8b63e25a23 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Feb 2022 12:07:10 +0100 Subject: [PATCH 098/104] Update restore --- scripts/restore | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/scripts/restore b/scripts/restore index 4846a4e..cce485a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -24,7 +24,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -37,7 +37,7 @@ mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." --time --weight=1 +ynh_script_progression --message="Validating restoration parameters..." --weight=1 test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -47,14 +47,14 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --time --weight=1 +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" @@ -62,7 +62,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --time --weight=1 +ynh_script_progression --message="Restoring the app main directory..." --weight=2 ynh_restore_file --origin_path="$final_path" @@ -74,7 +74,7 @@ chmod +x "$final_path/minio" #================================================= # RESTORE THE DATA DIRECTORY #================================================= -ynh_script_progression --message="Restoring the data directory..." --time --weight=1 +ynh_script_progression --message="Restoring the data directory..." --weight=3 ynh_restore_file --origin_path="$datadir" --not_mandatory @@ -87,7 +87,7 @@ chown -R $app:www-data "$datadir" #================================================= # RESTORE SYSTEMD #================================================= -ynh_script_progression --message="Restoring the systemd configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet @@ -95,28 +95,21 @@ systemctl enable $app.service --quiet #================================================= # RESTORE THE LOGROTATE CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the logrotate configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 ynh_restore_file --origin_path="/etc/logrotate.d/$app" -#================================================= -# RESTORE THE LOGS -#================================================= -ynh_script_progression --message="Restoring the logs..." --time --weight=1 - -ynh_restore_file --origin_path="/var/log/$app/$app.log" - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 yunohost service add $app --description="A High Performance, Kubernetes Native Object Storage" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=3 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" @@ -125,7 +118,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -133,4 +126,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --time --last +ynh_script_progression --message="Restoration completed for $app" --last From 339f4f181e5dc99cd5fe092c982270be9cbf2714 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Feb 2022 12:17:58 +0100 Subject: [PATCH 099/104] Update remove --- scripts/remove | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/remove b/scripts/remove index 980fd3b..8d04375 100755 --- a/scripts/remove +++ b/scripts/remove @@ -78,16 +78,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." --time --weight=1 - -# Remove the log files -ynh_secure_remove --file="/var/log/$app" - #================================================= # GENERIC FINALIZATION #================================================= From 38af11816d3e81586592ae0ad82988d561a9c563 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Feb 2022 12:22:47 +0100 Subject: [PATCH 100/104] Update upgrade --- scripts/upgrade | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7945f56..19a6d18 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,13 +85,6 @@ 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=5 - -ynh_install_app_dependencies $pkg_dependencies - # #================================================= # # ADD A CONFIGURATION # #================================================= From 0222ad678c40a996070c7af78628a542e93b582a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Feb 2022 12:25:32 +0100 Subject: [PATCH 101/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 60ac59a..a140b96 100755 --- a/scripts/install +++ b/scripts/install @@ -103,7 +103,7 @@ ynh_setup_source --dest_dir="$mc_path" --source_id="mc" chmod -R 750 "$mc_path" chmod -R o-rwx "$mc_path" chown -R $app:www-data "$mc_path" -chmod +x $mc_path/mc +chmod +x "$mc_path/mc" #================================================= # NGINX CONFIGURATION From bff66a39baf6f8d7d965304d71b61da82195ff79 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Feb 2022 12:26:06 +0100 Subject: [PATCH 102/104] Update upgrade --- scripts/upgrade | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 19a6d18..6cdf50a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,6 +77,18 @@ chmod -R o-rwx "$final_path" chown -R $app:$app "$final_path" chmod +x "$final_path/minio" +#================================================= +# DOWNLOAD, CHECK AND UNPACK MINIO CLIENT +#================================================= +ynh_script_progression --message="Setting up MinIO client..." --weight=1 + +ynh_setup_source --dest_dir="$mc_path" --source_id="mc" + +chmod -R 750 "$mc_path" +chmod -R o-rwx "$mc_path" +chown -R $app:www-data "$mc_path" +chmod +x "$mc_path/mc" + #================================================= # NGINX CONFIGURATION #================================================= From e383678d4e9eb6cb1388f8bfef86a9144eeb737c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Feb 2022 13:09:16 +0100 Subject: [PATCH 103/104] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 6cdf50a..98fdf42 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +mc_path=$(ynh_app_setting_get --app=$app --key=mc_path) minio_key=$(ynh_app_setting_get --app=$app --key=minio_key) architecture=$YNH_ARCH From 7aaa04add85156900746dadafaba5f8dba8130b7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Feb 2022 14:27:31 +0100 Subject: [PATCH 104/104] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a140b96..2271559 100755 --- a/scripts/install +++ b/scripts/install @@ -37,7 +37,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." --weight=1 -final_path="/opt/yunohost/$app" +final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" mc_path=$final_path/mc