From 02d099337ece0960a3466a6e50d98f72f8d72420 Mon Sep 17 00:00:00 2001 From: Florent Date: Thu, 5 Jan 2023 10:38:30 +0100 Subject: [PATCH 01/13] Remove unnecessary files + remove nginx as service in manifest --- doc/screenshots/.gitkeep | 0 manifest.json | 4 +--- sources/extra_files/app/.gitignore | 2 -- sources/patches/.gitignore | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 doc/screenshots/.gitkeep delete mode 100644 sources/extra_files/app/.gitignore delete mode 100644 sources/patches/.gitignore diff --git a/doc/screenshots/.gitkeep b/doc/screenshots/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/manifest.json b/manifest.json index 51570b6..27e91b1 100644 --- a/manifest.json +++ b/manifest.json @@ -24,9 +24,7 @@ "yunohost": ">= 11.0.0" }, "multi_instance": true, - "services": [ - "nginx" - ], + "services": [], "arguments": { "install": [] } diff --git a/sources/extra_files/app/.gitignore b/sources/extra_files/app/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/extra_files/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] diff --git a/sources/patches/.gitignore b/sources/patches/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/patches/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] From 1d75000b2c9d175d26f479c99f9caaf34dceee01 Mon Sep 17 00:00:00 2001 From: Florent Date: Thu, 5 Jan 2023 13:03:13 +0100 Subject: [PATCH 02/13] Delete 90-max_map_count-opensearch.conf when removing app --- scripts/remove | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/remove b/scripts/remove index 3e99783..115d181 100755 --- a/scripts/remove +++ b/scripts/remove @@ -103,6 +103,22 @@ ynh_script_progression --message="Removing the dedicated system user..." --weigh # Delete a system user ynh_system_user_delete --username=$app +#================================================= +# SPECIFIC REMOVE +#================================================= +# REMOVE VARIOUS FILES +#================================================= +ynh_script_progression --message="Removing various files..." + +if [ -e "/etc/sysctl.d/90-max_map_count-opensearch.conf" ]; then + ynh_secure_remove --file="/etc/sysctl.d/90-max_map_count-opensearch.conf" + # Reload the kernel configuration. + if ! IS_PACKAGE_CHECK # LXC doesn't allow sysctl to play with kernel options. + then + sysctl --system + fi +fi + #================================================= # END OF SCRIPT #================================================= From dc0e0d87cc5a2d845eebaece5b103448abaf3cb3 Mon Sep 17 00:00:00 2001 From: Florent Date: Thu, 5 Jan 2023 13:05:21 +0100 Subject: [PATCH 03/13] Bump version to 2.4.1~ynh2 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 27e91b1..31f7039 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source distributed and RESTful search engine.", "fr": "Moteur de recherche RESTful et open-source." }, - "version": "2.4.1~ynh1", + "version": "2.4.1~ynh2", "url": "https://github.com/opensearch-project/OpenSearch", "upstream": { "license": "Apache-2.0", From e922bc339700d664156a5a5a9003d690fb2eae51 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 5 Jan 2023 14:29:32 +0000 Subject: [PATCH 04/13] 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 343dcd0..4d677fe 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ OpenSearch makes it easy to ingest, search, visualize, and analyze your data. OpenSearch is a scalable, flexible, and extensible open-source software suite for search, analytics, and observability applications licensed under Apache 2.0. Powered by Apache Lucene and driven by the OpenSearch Project community, OpenSearch offers a vendor-agnostic toolset you can use to build secure, high-performance, cost-efficient applications. Use OpenSearch as an end-to-end solution or connect it with your preferred open-source tools or partner projects. -**Shipped version:** 2.4.1~ynh1 +**Shipped version:** 2.4.1~ynh2 **Demo:** https://playground.opensearch.org/app/home ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 6964c2c..a830fbc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ OpenSearch makes it easy to ingest, search, visualize, and analyze your data. OpenSearch is a scalable, flexible, and extensible open-source software suite for search, analytics, and observability applications licensed under Apache 2.0. Powered by Apache Lucene and driven by the OpenSearch Project community, OpenSearch offers a vendor-agnostic toolset you can use to build secure, high-performance, cost-efficient applications. Use OpenSearch as an end-to-end solution or connect it with your preferred open-source tools or partner projects. -**Version incluse :** 2.4.1~ynh1 +**Version incluse :** 2.4.1~ynh2 **Démo :** https://playground.opensearch.org/app/home ## Avertissements / informations importantes From 384fa31f4773c096d5ac777df9a426f89ea0eb59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 5 Jan 2023 16:18:42 +0100 Subject: [PATCH 05/13] homogenization --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 31f7039..70fb857 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "opensearch", "packaging_format": 1, "description": { - "en": "Open source distributed and RESTful search engine.", - "fr": "Moteur de recherche RESTful et open-source." + "en": "Open source distributed and RESTful search engine", + "fr": "Moteur de recherche RESTful et open-source" }, "version": "2.4.1~ynh2", "url": "https://github.com/opensearch-project/OpenSearch", From fbcf9ef585908ce0caf036860c6b898ecf1aaf47 Mon Sep 17 00:00:00 2001 From: Florent Date: Thu, 5 Jan 2023 16:25:23 +0100 Subject: [PATCH 06/13] Remove useless installation of dependencies --- scripts/_common.sh | 3 --- scripts/install | 7 ------- scripts/restore | 9 --------- scripts/upgrade | 7 ------- 4 files changed, 26 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e40900d..2c37081 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,9 +3,6 @@ #================================================= # COMMON VARIABLES #================================================= -# PHP APP SPECIFIC -#================================================= -pkg_dependencies="" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 8c4adae..b5f133c 100755 --- a/scripts/install +++ b/scripts/install @@ -51,13 +51,6 @@ ynh_app_setting_set --app=$app --key=xms --value=$xms xmx=1g ynh_app_setting_set --app=$app --key=xmx --value=$xmx -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing dependencies..." --weight=1 - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # CREATE DEDICATED USER #================================================= diff --git a/scripts/restore b/scripts/restore index fc9eff0..9d07f2d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -85,15 +85,6 @@ chown $app:$app "/run/$app" #================================================= # SPECIFIC RESTORATION -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 - -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies - - #================================================= # RESTORE VARIOUS FILES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5717200..cee2c90 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,13 +101,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:$app "$final_path" -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=1 - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # UPDATE A CONFIG FILE #================================================= From 99d856ddb894c6cd88a6340233758b3c7be1d165 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 6 Jan 2023 14:49:29 +0100 Subject: [PATCH 07/13] Remove useless php-fpm.conf --- conf/php-fpm.conf | 430 ---------------------------------------------- 1 file changed, 430 deletions(-) delete mode 100644 conf/php-fpm.conf 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 From 51f65e45a91a6b13c27e5fbfea13fa14beafe0b3 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 6 Jan 2023 14:52:31 +0100 Subject: [PATCH 08/13] Remove useless conf/nginx.conf --- conf/nginx.conf | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 conf/nginx.conf diff --git a/conf/nginx.conf b/conf/nginx.conf deleted file mode 100644 index 6b738ce..0000000 --- a/conf/nginx.conf +++ /dev/null @@ -1,28 +0,0 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { - - # Path to source - alias __FINALPATH__/; - -### 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; -} From ae37514c2a3a619531c32150a386171e38f1c717 Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 9 Jan 2023 12:36:39 +0100 Subject: [PATCH 09/13] Fix manifest licence --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 70fb857..167f250 100644 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "admindoc": "https://opensearch.org/docs/latest/", "code": "https://github.com/opensearch-project/OpenSearch" }, - "license": "AGPL-3.0-or-later", + "license": "Apache-2.0", "maintainer": { "name": "fflorent", "email": "florent.git@zeteo.me" From 71b792d3fadc0d186565cedcc7c14ef29a6d4ff5 Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 9 Jan 2023 12:40:50 +0100 Subject: [PATCH 10/13] Change check before running sysctl (any lxc container) --- scripts/_common.sh | 9 +-------- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2c37081..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,14 +7,7 @@ #================================================= # PERSONAL HELPERS #================================================= -IS_PACKAGE_CHECK () { - if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ] - then - return 0 - else - return 1 - fi -} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index b5f133c..6991e77 100755 --- a/scripts/install +++ b/scripts/install @@ -116,7 +116,7 @@ ynh_script_progression --message="Increasing maximum map count (sysctl)..." # Increase the maximum number of files inotify can monitor. cp -a ../conf/90-max_map_count-opensearch.conf /etc/sysctl.d/ # Then, reload the kernel configuration. -if ! IS_PACKAGE_CHECK # LXC doesn't allow sysctl to play with kernel options. +if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl -p /etc/sysctl.d/90-max_map_count-opensearch.conf fi diff --git a/scripts/remove b/scripts/remove index 115d181..f662b19 100755 --- a/scripts/remove +++ b/scripts/remove @@ -113,7 +113,7 @@ ynh_script_progression --message="Removing various files..." if [ -e "/etc/sysctl.d/90-max_map_count-opensearch.conf" ]; then ynh_secure_remove --file="/etc/sysctl.d/90-max_map_count-opensearch.conf" # Reload the kernel configuration. - if ! IS_PACKAGE_CHECK # LXC doesn't allow sysctl to play with kernel options. + if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl --system fi diff --git a/scripts/restore b/scripts/restore index 9d07f2d..d2b60ce 100755 --- a/scripts/restore +++ b/scripts/restore @@ -91,7 +91,7 @@ chown $app:$app "/run/$app" ynh_script_progression --message="Restoring various files..." ynh_restore_file --origin_path="/etc/sysctl.d/90-max_map_count-opensearch.conf" -if ! IS_PACKAGE_CHECK # LXC doesn't allow sysctl to play with kernel options. +if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl -p /etc/sysctl.d/90-max_map_count-opensearch.conf fi diff --git a/scripts/upgrade b/scripts/upgrade index cee2c90..f10ba30 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -120,7 +120,7 @@ ynh_script_progression --message="Increasing maximum map count (sysctl)..." # Increase the maximum number of files inotify can monitor. cp -a ../conf/90-max_map_count-opensearch.conf /etc/sysctl.d/ # Then, reload the kernel configuration. -if ! IS_PACKAGE_CHECK # LXC doesn't allow sysctl to play with kernel options. +if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl -p /etc/sysctl.d/90-max_map_count-opensearch.conf fi From d1c400312c76ce21e20016cbbc8a4182a7c3f76f Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 17 Jan 2023 14:51:56 +0100 Subject: [PATCH 11/13] Fix '$container' is unbound when not in LXC --- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 6991e77..6392efd 100755 --- a/scripts/install +++ b/scripts/install @@ -116,7 +116,7 @@ ynh_script_progression --message="Increasing maximum map count (sysctl)..." # Increase the maximum number of files inotify can monitor. cp -a ../conf/90-max_map_count-opensearch.conf /etc/sysctl.d/ # Then, reload the kernel configuration. -if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. +if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl -p /etc/sysctl.d/90-max_map_count-opensearch.conf fi diff --git a/scripts/remove b/scripts/remove index f662b19..1678397 100755 --- a/scripts/remove +++ b/scripts/remove @@ -113,7 +113,7 @@ ynh_script_progression --message="Removing various files..." if [ -e "/etc/sysctl.d/90-max_map_count-opensearch.conf" ]; then ynh_secure_remove --file="/etc/sysctl.d/90-max_map_count-opensearch.conf" # Reload the kernel configuration. - if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. + if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl --system fi diff --git a/scripts/restore b/scripts/restore index d2b60ce..a661ae1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -91,7 +91,7 @@ chown $app:$app "/run/$app" ynh_script_progression --message="Restoring various files..." ynh_restore_file --origin_path="/etc/sysctl.d/90-max_map_count-opensearch.conf" -if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. +if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl -p /etc/sysctl.d/90-max_map_count-opensearch.conf fi diff --git a/scripts/upgrade b/scripts/upgrade index f10ba30..c5a341c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -120,7 +120,7 @@ ynh_script_progression --message="Increasing maximum map count (sysctl)..." # Increase the maximum number of files inotify can monitor. cp -a ../conf/90-max_map_count-opensearch.conf /etc/sysctl.d/ # Then, reload the kernel configuration. -if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. +if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl -p /etc/sysctl.d/90-max_map_count-opensearch.conf fi From 593b64881320100e3df70a7947d0672b117794f7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 17 Jan 2023 13:52:17 +0000 Subject: [PATCH 12/13] Auto-update README --- README_fr.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README_fr.md b/README_fr.md index a830fbc..9d4e348 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,15 @@ It shall NOT be edited by hand. # OpenSearch pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/opensearch.svg)](https://dash.yunohost.org/appci/app/opensearch) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/opensearch.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/opensearch.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/opensearch.svg)](https://dash.yunohost.org/appci/app/opensearch) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/opensearch.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/opensearch.maintain.svg) [![Installer OpenSearch avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=opensearch) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer OpenSearch rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer OpenSearch rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble OpenSearch makes it easy to ingest, search, visualize, and analyze your data. @@ -35,9 +35,9 @@ OpenSearch is a scalable, flexible, and extensible open-source software suite fo ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -53,4 +53,4 @@ ou sudo yunohost app upgrade opensearch -u https://github.com/YunoHost-Apps/opensearch_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From cc1441d4d1d5f69d2f3bb41ff07611908401529b Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 20 Jan 2023 09:11:17 +0100 Subject: [PATCH 13/13] Remove useless instruction for app dependency removal --- scripts/remove | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/remove b/scripts/remove index 1678397..c12069e 100755 --- a/scripts/remove +++ b/scripts/remove @@ -75,14 +75,6 @@ fi ynh_script_progression --message="Removing pid directory..." --weight=1 ynh_secure_remove --file="/run/$app" -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - #================================================= # CLOSE A PORT #=================================================