From 8f02ca1fcf1201e5fb236030d2cff8b13f43b43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 16 May 2023 19:28:10 +0200 Subject: [PATCH] v2 --- .github/workflows/updater.sh | 90 ---- .github/workflows/updater.yml | 49 -- conf/extra_php-fpm.conf | 4 + conf/parameters.yml | 74 +++ conf/php-fpm.conf | 434 ------------------ doc/{DISCLAIMER.md => ADMIN.md} | 0 doc/{DISCLAIMER_fr.md => ADMIN_fr.md} | 0 doc/screenshots/screenshot1.webp | Bin 39924 -> 0 bytes .../wallabag-quick-start-page.png | Bin manifest.json | 49 -- manifest.toml | 30 +- scripts/_common.sh | 31 -- scripts/backup | 21 +- scripts/change_url | 91 +--- scripts/install | 106 +---- scripts/remove | 46 -- scripts/restore | 61 +-- scripts/upgrade | 110 +---- tests.toml | 9 + 19 files changed, 137 insertions(+), 1068 deletions(-) delete mode 100644 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml create mode 100644 conf/extra_php-fpm.conf create mode 100644 conf/parameters.yml delete mode 100644 conf/php-fpm.conf rename doc/{DISCLAIMER.md => ADMIN.md} (100%) rename doc/{DISCLAIMER_fr.md => ADMIN_fr.md} (100%) delete mode 100644 doc/screenshots/screenshot1.webp rename doc/{ => screenshots}/wallabag-quick-start-page.png (100%) delete mode 100644 manifest.json create mode 100644 tests.toml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100644 index 31aea45..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -#================================================= -# PACKAGE UPDATING HELPER -#================================================= - -# This script is meant to be run by GitHub Actions -# The YunoHost-Apps organisation offers a template Action to run this script periodically -# Since each app is different, maintainers can adapt its contents so as to perform -# automatic actions when a new upstream release is detected. - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') -# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) -asset_url="https://static.wallabag.org/releases/wallabag-release-$version.tar.gz" - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV -# For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV - -# Proceed only if the retrieved version is greater than the current one -if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 -# Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 -fi - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -echo "Handling asset at $asset_url" - -src="app" -extension="tar.gz" - -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - -# Delete temporary directory -rm -rf $tempdir - -# Rewrite source file -cat < conf/$src.src -SOURCE_URL=$asset_url -SOURCE_SUM=$checksum -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=$extension -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true -EOT -echo "... conf/$src.src updated" - -#================================================= -# SPECIFIC UPDATE STEPS -#================================================= - -# Any action on the app's source code can be done. -# The GitHub Action workflow takes care of committing all changes after this script ends. - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json - -# No need to update the README, yunohost-bot takes care of it - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index a56d7cb..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,49 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash .github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - base: testing - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf new file mode 100644 index 0000000..700c37c --- /dev/null +++ b/conf/extra_php-fpm.conf @@ -0,0 +1,4 @@ +; Additional php.ini defines, specific to this pool of workers. + +php_admin_value[upload_max_filesize] = 50M +php_admin_value[post_max_size] = 50M diff --git a/conf/parameters.yml b/conf/parameters.yml new file mode 100644 index 0000000..5cc47fb --- /dev/null +++ b/conf/parameters.yml @@ -0,0 +1,74 @@ +# This file is a "template" of what your parameters.yml file should look like +parameters: + # Uncomment these settings or manually update your parameters.yml + # to use docker-compose + # + # database_driver: %env.database_driver% + # database_host: %env.database_host% + # database_port: %env.database_port% + # database_name: %env.database_name% + # database_user: %env.database_user% + # database_password: %env.database_password% + + database_driver: pdo_mysql + database_host: 127.0.0.1 + database_port: ~ + database_name: __DB_NAME__ + database_user: __DB_USER__ + database_password: __DB_PWD__ + # For SQLite, database_path should be "%kernel.project_dir%/data/db/wallabag.sqlite" + database_path: null + database_table_prefix: null + database_socket: null + # with PostgreSQL and SQLite, you must set "utf8" + database_charset: utf8mb4 + + domain_name: https://__DOMAIN____PATH__ + server_name: "Your wallabag instance" + + mailer_transport: smtp + mailer_user: ~ + mailer_password: ~ + mailer_host: 127.0.0.1 + mailer_port: false + mailer_encryption: ~ + mailer_auth_mode: ~ + + locale: en + + # A secret key that's used to generate certain security-related tokens + secret: __DESKEY__ + + # two factor stuff + twofactor_auth: true + twofactor_sender: no-reply@wallabag.org + + # fosuser stuff + fosuser_registration: false + fosuser_confirmation: true + + # how long the access token should live in seconds for the API + fos_oauth_server_access_token_lifetime: 3600 + # how long the refresh token should life in seconds for the API + fos_oauth_server_refresh_token_lifetime: 1209600 + + from_email: no-reply@wallabag.org + + rss_limit: 50 + + # RabbitMQ processing + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + rabbitmq_prefetch_count: 10 + + # Redis processing + redis_scheme: tcp + redis_host: localhost + redis_port: 6379 + redis_path: null + redis_password: null + + # sentry logging + sentry_dsn: ~ diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index 5809b80..0000000 --- a/conf/php-fpm.conf +++ /dev/null @@ -1,434 +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 = __INSTALL_DIR__ - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M - -; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M -; php_admin_flag[mail.add_x_header] = Off - -; Other common parameters -; php_admin_value[max_execution_time] = 600 -; php_admin_value[max_input_time] = 300 -; php_admin_value[memory_limit] = 256M -; php_admin_flag[short_open_tag] = On - -php_admin_value[max_execution_time] = 3600 -php_admin_value[upload_max_filesize] = 50M -php_admin_value[post_max_size] = 50M diff --git a/doc/DISCLAIMER.md b/doc/ADMIN.md similarity index 100% rename from doc/DISCLAIMER.md rename to doc/ADMIN.md diff --git a/doc/DISCLAIMER_fr.md b/doc/ADMIN_fr.md similarity index 100% rename from doc/DISCLAIMER_fr.md rename to doc/ADMIN_fr.md diff --git a/doc/screenshots/screenshot1.webp b/doc/screenshots/screenshot1.webp deleted file mode 100644 index e447c1dfa469b20e4c65079185e3028b12f7d28a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39924 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 diff --git a/doc/wallabag-quick-start-page.png b/doc/screenshots/wallabag-quick-start-page.png similarity index 100% rename from doc/wallabag-quick-start-page.png rename to doc/screenshots/wallabag-quick-start-page.png diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 6b2beda..0000000 --- a/manifest.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "Wallabag", - "id": "wallabag2", - "packaging_format": 1, - "description": { - "en": "A self hostable read-it-later app", - "fr": "Une application de lecture-plus-tard auto-hébergeable" - }, - "version": "2.5.4~ynh2", - "url": "https://www.wallabag.org", - "upstream": { - "license": "MIT", - "website": "https://www.wallabag.org", - "demo": "https://demo.yunohost.org/wallabag/", - "admindoc": "https://doc.wallabag.org/en/", - "code": "https://github.com/wallabag/wallabag" - }, - "license": "MIT", - "maintainer": { - "name": "lapineige" - }, - "requirements": { - "yunohost": ">= 11.0" - }, - "multi_instance": true, - "services": [ - "nginx", - "php7.3-fpm", - "mysql" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/wallabag", - "default": "/wallabag" - }, - { - "name": "admin", - "type": "user" - } - ] - } -} diff --git a/manifest.toml b/manifest.toml index 6abb3a1..db221bf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -2,8 +2,8 @@ packaging_format = 2 id = "wallabag2" name = "Wallabag" -description.en = "A self hostable read-it-later app" -description.fr = "Une application de lecture-plus-tard auto-hébergeable" +description.en = "Self hostable read-it-later app" +description.fr = "Application de lecture-plus-tard auto-hébergeable" version = "2.5.4~ynh2" @@ -15,38 +15,33 @@ website = "https://www.wallabag.org" demo = "https://demo.yunohost.org/wallabag/" admindoc = "https://doc.wallabag.org/en/" code = "https://github.com/wallabag/wallabag" -cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) -fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. [integration] -yunohost = ">= 11.0" -architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +yunohost = ">= 11.1.19" +architectures = "all" multi_instance = true -ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. -sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. -disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... -ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... -ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ldap = true +sso = false +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" [install] [install.domain] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "domain" [install.path] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "path" default = "/wallabag" [install.admin] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "user" [resources] [resources.sources.main] - url = "https://static.wallabag.org/releases/wallabag-release-2.5.4.tar.gz" + url = "https://github.com/wallabag/wallabag/releases/download/2.5.4/wallabag-2.5.4.tar.gz" sha256 = "c953105e3181f18bf592541a1c46c318c6663ad00d4687052676b02a7d74c618" - + autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -55,5 +50,8 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources.permissions] main.url = "/" + [resources.apt] + packages = "mariadb-server php8.0-cli php8.0-mysql php8.0-json php8.0-gd php8.0-tidy php8.0-curl php8.0-gettext php8.0-redis php8.0-xml php8.0-mbstring php8.0-ldap php8.0-intl" + [resources.database] type = "mysql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 7e4e24c..599c71e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,41 +4,10 @@ # COMMON VARIABLES #================================================= -#REMOVEME? YNH_PHP_VERSION="7.4" - -# dependencies used by the app -#REMOVEME? pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-intl" - - #================================================= # PERSONAL HELPERS #================================================= -function set_permissions { - # Set permissions to app files - chown -R $app:www-data $install_dir - chmod -R g=u,g-w,o-rwx $install_dir - - # Restrict rights to Wallabag user only - chmod 600 $wb_conf - if [ -e $install_dir/var/cache/prod/appProdProjectContainer.php ]; then - chmod 700 $install_dir/var/cache/prod/appProdProjectContainer.php - fi -} - #================================================= # EXPERIMENTAL HELPERS #================================================= - -# Execute a command as another user -# usage: exec_as USER COMMAND [ARG ...] -ynh_exec_as() { - local USER=$1 - shift 1 - - if [[ $USER = $(whoami) ]]; then - eval "$@" - else - sudo -u "$USER" "$@" - fi -} diff --git a/scripts/backup b/scripts/backup index 0b509d5..225322e 100644 --- a/scripts/backup +++ b/scripts/backup @@ -10,25 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_print_info --message="Loading installation settings..." - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= @@ -39,7 +20,7 @@ ynh_print_info --message="Declaring files to be backed up..." #================================================= # Clean cache files before backup (saved some disk space) -#REMOVEME? ynh_secure_remove --file=$install_dir/var/cache/prod +ynh_secure_remove --file=$install_dir/var/cache/prod ynh_backup --src_path="$install_dir" diff --git a/scripts/change_url b/scripts/change_url index 1127468..f1f1074 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -8,62 +8,6 @@ source _common.sh source /usr/share/yunohost/helpers -#REMOVEME? ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN -#REMOVEME? old_path=$YNH_APP_OLD_PATH - -#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN -#REMOVEME? new_path=$YNH_APP_NEW_PATH - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=2 - -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." - -# Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. -#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -#REMOVEME? change_domain=0 -#REMOVEME? if [ "$old_domain" != "$new_domain" ] -then - #REMOVEME? change_domain=1 -fi - -#REMOVEME? change_path=0 -#REMOVEME? if [ "$old_path" != "$new_path" ] -then - #REMOVEME? change_path=1 -fi #================================================= # STANDARD MODIFICATIONS @@ -74,30 +18,6 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config -#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - -# Change the path in the NGINX config file -if [ $change_path -eq 1 ] -then - # Make a backup of the original NGINX config file if modified -#REMOVEME? ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for NGINX helper -#REMOVEME? domain="$old_domain" -#REMOVEME? path="$new_path" - # Create a dedicated NGINX config -#REMOVEME? ynh_add_nginx_config -fi - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location -#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" -#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location -#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi - #================================================= # SPECIFIC MODIFICATIONS #================================================= @@ -121,16 +41,7 @@ then fi # Clear assets cache -#REMOVEME? ynh_secure_remove --file=$install_dir/var/cache - -#================================================= -# GENERIC FINALISATION -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." - -#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload +ynh_secure_remove --file=$install_dir/var/cache #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 1c2deee..8725050 100644 --- a/scripts/install +++ b/scripts/install @@ -9,76 +9,15 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - -#REMOVEME? domain=$YNH_APP_ARG_DOMAIN -#REMOVEME? path=$YNH_APP_ARG_PATH -#REMOVEME? admin=$YNH_APP_ARG_ADMIN - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= -#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=2 - -#REMOVEME? install_dir=/var/www/$app -#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" - -# Register (book) web path -#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -#REMOVEME? ynh_script_progression --message="Storing installation settings..." - -#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain -#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path -#REMOVEME? ynh_app_setting_set --app=$app --key=admin --value=$admin - -#================================================= -# STANDARD MODIFICATIONS -#================================================= -# INSTALL DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=12 - -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies - -#================================================= -# CREATE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=2 - -# Create a system user -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - -#================================================= -# CREATE A MYSQL DATABASE -#================================================= -#REMOVEME? ynh_script_progression --message="Creating a MySQL database..." - -#REMOVEME? db_name=$(ynh_sanitize_dbid --db_name=$app) -#REMOVEME? db_user=$db_name -#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name -#REMOVEME? ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name +deskey=$(ynh_string_random --length=24) +ynh_app_setting_set --app=$app --key=deskey --value=$deskey #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=6 -#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" @@ -96,7 +35,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION +ynh_add_fpm_config --usage=low --footprint=low #================================================= # SPECIFIC SETUP @@ -105,20 +44,7 @@ ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION #================================================= ynh_script_progression --message="Configuring wallabag..." --weight=35 -# Copy and set Wallabag dist configuration -wb_conf=$install_dir/app/config/parameters.yml -cp $install_dir/app/config/parameters.yml.dist $wb_conf - -ynh_replace_string --match_string="fosuser_registration: true" --replace_string="fosuser_registration: false" --target_file=$wb_conf -ynh_replace_string --match_string="database_name: wallabag" --replace_string="database_name: $db_name" --target_file=$wb_conf -ynh_replace_string --match_string="database_user: root" --replace_string="database_user: $db_user" --target_file=$wb_conf -ynh_replace_string --match_string="database_password: ~" --replace_string="database_password: $db_pwd" --target_file=$wb_conf -ynh_replace_string --match_string="database_table_prefix: wallabag_" --replace_string="database_table_prefix: null" --target_file=$wb_conf -# Generate random DES key & password -deskey=$(ynh_string_random --length=24) -ynh_app_setting_set --app=$app --key=deskey --value=$deskey -ynh_replace_string --match_string="secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv" --replace_string="secret: $deskey" --target_file=$wb_conf -ynh_replace_string --match_string="domain_name: https://your-wallabag-url-instance.com" --replace_string="domain_name: https://$domain$path" --target_file=$wb_conf +ynh_add_config --template="../conf/parameters.yml" --destination="$install_dir/app/config/parameters.yml" # Alias for php-cli execution command php_exec="ynh_exec_as $app php$YNH_PHP_VERSION "$install_dir/bin/console" --no-interaction --env=prod" @@ -156,7 +82,15 @@ ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_fil # SECURE FILES AND DIRECTORIES #================================================= -set_permissions +# Set permissions to app files +chown -R $app:www-data $install_dir +chmod -R g=u,g-w,o-rwx $install_dir + +# Restrict rights to Wallabag user only +chmod 600 $install_dir/app/config/parameters.yml +if [ -e $install_dir/var/cache/prod/appProdProjectContainer.php ]; then + chmod 700 $install_dir/var/cache/prod/appProdProjectContainer.php +fi #================================================= # SETUP LOGROTATE @@ -181,20 +115,6 @@ chown $app: "/var/www/$app/var/logs/prod.log" # Create a dedicated Fail2Ban config ynh_add_fail2ban_config --logpath="/var/www/$app/var/logs/prod.log" --failregex='app.ERROR: Authentication failure for user "([\w]+)?", from IP ""' --max_retry=5 -#================================================= -# SETUP SSOWAT -#================================================= -#REMOVEME? ynh_script_progression --message="Configuring permissions..." - -#REMOVEME? ynh_permission_update --permission="main" --add="visitors" - -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." - -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index 190837e..04f5377 100644 --- a/scripts/remove +++ b/scripts/remove @@ -9,18 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) - #================================================= # STANDARD REMOVE #================================================= @@ -31,22 +19,6 @@ ynh_script_progression --message="Removing logrotate configuration..." # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# REMOVE THE MYSQL DATABASE -#================================================= -#REMOVEME? ynh_script_progression --message="Removing the MySQL database..." --weight=2 - -# Remove a database if it exists, along with the associated user -#REMOVEME? ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name - -#================================================= -# REMOVE APP MAIN DIR -#================================================= -#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=2 - -# Remove the app directory securely -#REMOVEME? ynh_secure_remove --file="$install_dir" - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -63,14 +35,6 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=9 - -# Remove metapackage and its dependencies -#REMOVEME? ynh_remove_app_dependencies - #================================================= # REMOVE FAIL2BAN CONFIGURATION #================================================= @@ -79,16 +43,6 @@ ynh_script_progression --message="Removing Fail2Ban configuration..." # Remove the dedicated Fail2Ban config ynh_remove_fail2ban_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." - -# Delete a system user -#REMOVEME? ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 2c4fc12..7b2d7ba 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,35 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=2 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." - -#REMOVEME? test ! -d $install_dir \ - || ynh_die --message="There is already a directory: $install_dir " - #================================================= # STANDARD RESTORATION STEPS #================================================= @@ -48,14 +19,6 @@ ynh_script_progression --message="Restoring the NGINX web server configuration.. ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=2 - -# Create the dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -67,9 +30,15 @@ ynh_restore_file --origin_path="$install_dir" # RESTORE USER RIGHTS #================================================= -wb_conf=$install_dir/app/config/parameters.yml +# Set permissions to app files +chown -R $app:www-data $install_dir +chmod -R g=u,g-w,o-rwx $install_dir -set_permissions +# Restrict rights to Wallabag user only +chmod 600 $install_dir/app/config/parameters.yml +if [ -e $install_dir/var/cache/prod/appProdProjectContainer.php ]; then + chmod 700 $install_dir/var/cache/prod/appProdProjectContainer.php +fi #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -94,23 +63,11 @@ ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" ynh_systemd_action --action=restart --service_name=fail2ban -#================================================= -# SPECIFIC RESTORATION -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=15 - -# Define and install dependencies -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies - #================================================= # RESTORE THE MYSQL DATABASE #================================================= -#REMOVEME? ynh_script_progression --message="Restoring the MySQL database..." --weight=3 +ynh_script_progression --message="Restoring the MySQL database..." --weight=3 -#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -#REMOVEME? ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7cf7446..1a8d064 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,83 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=2 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? admin=$(ynh_app_setting_get --app=$app --key=admin) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -#REMOVEME? deskey=$(ynh_app_setting_get --app=$app --key=deskey) - #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=30 - -# Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { - # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." - -# Cleaning legacy permissions -#REMOVEME? if ynh_legacy_permissions_exists; then -#REMOVEME? ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - -# If db_name doesn't exist, create it -if [ -z "$db_name" ]; then - db_name=$(ynh_sanitize_dbid --db_name=$app) -#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name -fi - -# If install_dir doesn't exist, create it -if [ -z "$install_dir" ]; then -#REMOVEME? install_dir=/var/www/$app -#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir -fi - -# If path doesn't exist, create it -if [ -z "$path" ]; then -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path -fi - -#================================================= -# CREATE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." - -# Create a dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -98,7 +27,7 @@ then ynh_setup_source --dest_dir="$install_dir" # Clear cache -#REMOVEME? ynh_secure_remove --file="$install_dir/var/cache" + ynh_secure_remove --file="$install_dir/var/cache" mkdir "$install_dir/var/cache" fi @@ -110,20 +39,13 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=7 - -#REMOVEME? ynh_install_app_dependencies $pkg_dependencies - #================================================= # PHP-FPM CONFIGURATION #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION +ynh_add_fpm_config --usage=low --footprint=low # Set-up fail2ban # Create the log file is not already existing @@ -133,6 +55,7 @@ then touch "$install_dir/var/logs/prod.log" chown $app: "$install_dir/var/logs/prod.log" fi + # Add fail2ban config ynh_add_fail2ban_config --logpath="$install_dir/var/logs/prod.log" --failregex='app.ERROR: Authentication failure for user "([\w]+)?", from IP ""' --max_retry=5 # same as install config @@ -142,22 +65,12 @@ ynh_add_fail2ban_config --logpath="$install_dir/var/logs/prod.log" --failregex=' # CONFIGURE WALLABAG #================================================= -wb_conf=$install_dir/app/config/parameters.yml - if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Reconfiguring wallabag..." --weight=11 # Copy and set Wallabag dist configuration - cp $install_dir/app/config/parameters.yml.dist $wb_conf - - ynh_replace_string --match_string="fosuser_registration: true" --replace_string="fosuser_registration: false" --target_file=$wb_conf - ynh_replace_string --match_string="database_name: wallabag" --replace_string="database_name: $db_name" --target_file=$wb_conf - ynh_replace_string --match_string="database_user: root" --replace_string="database_user: $db_user" --target_file=$wb_conf - ynh_replace_string --match_string="database_password: ~" --replace_string="database_password: $db_pwd" --target_file=$wb_conf - ynh_replace_string --match_string="database_table_prefix: wallabag_" --replace_string="database_table_prefix: null" --target_file=$wb_conf - ynh_replace_string --match_string="secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv" --replace_string="secret: $deskey" --target_file=$wb_conf - ynh_replace_string --match_string="domain_name: https://your-wallabag-url-instance.com" --replace_string="domain_name: https://$domain$path" --target_file=$wb_conf + ynh_add_config --template="../conf/parameters.yml" --destination="$install_dir/app/config/parameters.yml" #================================================= # UPGRADE WALLABAG @@ -196,14 +109,15 @@ ynh_use_logrotate --non-append # SECURE FILES AND DIRECTORIES #================================================= -set_permissions +# Set permissions to app files +chown -R $app:www-data $install_dir +chmod -R g=u,g-w,o-rwx $install_dir -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." - -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload +# Restrict rights to Wallabag user only +chmod 600 $install_dir/app/config/parameters.yml +if [ -e $install_dir/var/cache/prod/appProdProjectContainer.php ]; then + chmod 700 $install_dir/var/cache/prod/appProdProjectContainer.php +fi #================================================= # END OF SCRIPT diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..6e71bd9 --- /dev/null +++ b/tests.toml @@ -0,0 +1,9 @@ +test_format = 1.0 + +[default] + + # ------------------------------- + # Commits to test upgrade from + # ------------------------------- + + test_upgrade_from.4da53256350d7e4d63812ed3244e945346a5d9b7.name = "Upgrade from 2.3.8~ynh4"