diff --git a/LICENSE b/LICENSE
index 7d1e40b..ed6bb70 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,21 @@
-File containing the license of your package.
+ANTI-CAPITALIST SOFTWARE LICENSE (v 1.4)
-More information here:
-https://yunohost.org/packaging_apps_guidelines#yep-1-3
+Copyright © 2020 Mouse Reeve
+
+This is anti-capitalist software, released for free use by individuals and organizations that do not operate by capitalist principles.
+
+Permission is hereby granted, free of charge, to any person or organization (the "User") obtaining a copy of this software and associated documentation files (the "Software"), to use, copy, modify, merge, distribute, and/or sell copies of the Software, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all copies or modified versions of the Software.
+
+ The User is one of the following:
+ An individual person, laboring for themselves
+ A non-profit organization
+ An educational institution
+ An organization that seeks shared profit for all of its members, and allows non-members to set the cost of their labor
+
+ If the User is an organization with owners, then all owners are workers and all workers are owners with equal equity and/or equal vote.
+
+ If the User is an organization, then the User is not law enforcement or military, or working for or under either.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index 565d57e..83ba374 100644
--- a/README.md
+++ b/README.md
@@ -1,83 +1,52 @@
-# Packaging your an app, starting from this example
-
-- Copy this app before working on it, using the ['Use this template'](https://github.com/YunoHost/example_ynh/generate) button on the Github repo.
-- Edit the `manifest.json` with app specific info.
-- Edit the `install`, `upgrade`, `remove`, `backup`, and `restore` scripts, and any relevant conf files in `conf/`.
- - Using the [script helpers documentation.](https://yunohost.org/packaging_apps_helpers)
-- Add a `LICENSE` file for the package.
-- Edit `doc/DISCLAIMER*.md`
-- The `README.md` files are to be automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
-
----
-# Example app for YunoHost
+# BookWyrm for YunoHost
-[](https://dash.yunohost.org/appci/app/example)  
-[](https://install-app.yunohost.org/?app=example)
+[](https://dash.yunohost.org/appci/app/example)  
+[](https://install-app.yunohost.org/?app=BookWyrm_ynh)
*[Lire ce readme en français.](./README_fr.md)*
-> *This package allows you to install Example app quickly and simply on a YunoHost server.
+> *This package allows you to install BookWyrm quickly and simply on a YunoHost server.
If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
## Overview
-Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+BookWyrm is a social network for tracking your reading, talking about books, writing reviews, and discovering what to read next. Federation allows BookWyrm users to join small, trusted communities that can connect with one another, and with other ActivityPub services like Mastodon and Pleroma.
-### Features
+**Shipped version:** 0.5.3~ynh1
-- Ut enim ad minim veniam, quis nostrud exercitation ullamco ;
-- Laboris nisi ut aliquip ex ea commodo consequat ;
-- Duis aute irure dolor in reprehenderit in voluptate ;
-- Velit esse cillum dolore eu fugiat nulla pariatur ;
-- Excepteur sint occaecat cupidatat non proident, sunt in culpa."
-
-
-**Shipped version:** 1.0~ynh1
-
-**Demo:** https://demo.example.com
+**Demo:** https://joinbookwyrm.com/
## Screenshots
-
+
## Disclaimers / important information
-* Any known limitations, constrains or stuff not working, such as (but not limited to):
- * requiring a full dedicated domain ?
- * architectures not supported ?
- * not-working single-sign on or LDAP integration ?
- * the app requires an important amount of RAM / disk / .. to install or to work properly
- * etc...
-* Other infos that people should be aware of, such as:
- * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...)
- * how to configure / administrate the application if it ain't obvious
- * upgrade process / specificities / things to be aware of ?
- * security considerations ?
## Documentation and resources
-* Official app website: https://example.com
-* Official user documentation: https://yunohost.org/apps
-* Official admin documentation: https://yunohost.org/packaging_apps
-* Upstream app code repository: https://some.forge.com/example/example
-* YunoHost documentation for this app: https://yunohost.org/app_example
-* Report a bug: https://github.com/YunoHost-Apps/example_ynh/issues
+* Official app website:
+* Official admin documentation:
+* Upstream app code repository:
+* YunoHost documentation for this app:
+* Report a bug:
## Developer info
-Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/example_ynh/tree/testing).
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/BookWyrm_ynh/tree/testing).
To try the testing branch, please proceed like that.
-```
-sudo yunohost app install https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug
+
+``` bash
+sudo yunohost app install https://github.com/YunoHost-Apps/BookWyrm_ynh/tree/testing --debug
or
-sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug
+sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/BookWyrm_ynh/tree/testing --debug
```
-**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
+**More info regarding app packaging:**
diff --git a/README_fr.md b/README_fr.md
index c89de4d..79a0256 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,68 +1,52 @@
-# Example app pour YunoHost
+
-[](https://dash.yunohost.org/appci/app/example)  
-[](https://install-app.yunohost.org/?app=example)
+# BookWyrm pour YunoHost
+
+[](https://dash.yunohost.org/appci/app/example)  
+[](https://install-app.yunohost.org/?app=BookWyrm_ynh)
*[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer Example app rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
## Vue d'ensemble
-Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-
-### Features
-
-- Ut enim ad minim veniam, quis nostrud exercitation ullamco ;
-- Laboris nisi ut aliquip ex ea commodo consequat ;
-- Duis aute irure dolor in reprehenderit in voluptate ;
-- Velit esse cillum dolore eu fugiat nulla pariatur ;
-- Excepteur sint occaecat cupidatat non proident, sunt in culpa."
+BookWyrm est un réseau social qui vous permet de suivre vos lectures, de parler de livres, d'écrire des critiques et de découvrir vos prochaines lectures. Federation permet aux utilisateurs de BookWyrm de rejoindre de petites communautés de confiance qui peuvent se connecter entre elles et avec d'autres services ActivityPub comme Mastodon et Pleroma.
-**Version incluse :** 1.0~ynh1
+**Version incluse :** 0.5.3~ynh1
-**Démo :** https://demo.example.com
+**Démo :** https://joinbookwyrm.com/fr/
## Captures d'écran
-
+
## Avertissements / informations importantes
-* Any known limitations, constrains or stuff not working, such as (but not limited to):
- * requiring a full dedicated domain ?
- * architectures not supported ?
- * not-working single-sign on or LDAP integration ?
- * the app requires an important amount of RAM / disk / .. to install or to work properly
- * etc...
-
-* Other infos that people should be aware of, such as:
- * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...)
- * how to configure / administrate the application if it ain't obvious
- * upgrade process / specificities / things to be aware of ?
- * security considerations ?
## Documentations et ressources
-* Site officiel de l'app : https://example.com
-* Documentation officielle utilisateur : https://yunohost.org/apps
-* Documentation officielle de l'admin : https://yunohost.org/packaging_apps
-* Dépôt de code officiel de l'app : https://some.forge.com/example/example
-* Documentation YunoHost pour cette app : https://yunohost.org/app_example
-* Signaler un bug : https://github.com/YunoHost-Apps/example_ynh/issues
+* Site officiel de l'app :
+* Documentation officielle de l'admin :
+* Dépôt de code officiel de l'app :
+* Documentation YunoHost pour cette app :
+* Signaler un bug :
## Informations pour les développeurs
-Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/example_ynh/tree/testing).
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/bookwyrm_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit.
-```
-sudo yunohost app install https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug
+
+``` bash
+sudo yunohost app install https://github.com/YunoHost-Apps/bookwyrm_ynh/tree/testing --debug
ou
-sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug
+sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/bookwyrm_ynh/tree/testing --debug
```
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file
+**Plus d'infos sur le packaging d'applications :**
diff --git a/check_process b/check_process
index f41c4c9..c1a65ce 100644
--- a/check_process
+++ b/check_process
@@ -1,34 +1,21 @@
-# See here for more information
-# https://github.com/YunoHost/package_check#syntax-check_process-file
-
-# Move this file from check_process.default to check_process when you have filled it.
-
;; Test complet
; Manifest
domain="domain.tld"
- path="/path"
is_public=1
language="fr"
admin="john"
- password="1Strong-Password"
- port="666"
; Checks
pkg_linter=1
- setup_sub_dir=1
+ setup_sub_dir=0
setup_root=1
setup_nourl=0
setup_private=1
setup_public=1
upgrade=1
- upgrade=1 from_commit=CommitHash
+ #upgrade=1 from_commit=CommitHash
backup_restore=1
- multi_instance=1
- port_already_use=0
- change_url=1
+ multi_instance=0
+ change_url=0
;;; Options
-Email=
-Notification=none
-;;; Upgrade options
- ; commit=CommitHash
- name=Name and date of the commit.
- manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666&
+Email=oufmilo@protonmail.com
+Notification=all
diff --git a/conf/app.src b/conf/app.src
index 17489bf..8a0a94e 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=url of app's source
-SOURCE_SUM=sha256 checksum
+SOURCE_URL=https://github.com/bookwyrm-social/bookwyrm/releases/tag/v0.5.3
+SOURCE_SUM=41E263369BB3E0ED23AF6D6E112BD35EDE082BD5BECFE1BE9BBA152E47EE4E86
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
deleted file mode 100644
index ab1a471..0000000
--- a/conf/php-fpm.conf
+++ /dev/null
@@ -1,430 +0,0 @@
-; Start a new pool named 'www'.
-; the variable $pool can be used in any directive and will be replaced by the
-; pool name ('www' here)
-[__NAMETOCHANGE__]
-
-; Per pool prefix
-; It only applies on the following directives:
-; - 'access.log'
-; - 'slowlog'
-; - 'listen' (unixsocket)
-; - 'chroot'
-; - 'chdir'
-; - 'php_values'
-; - 'php_admin_values'
-; When not set, the global prefix (or /usr) applies instead.
-; Note: This directive can also be relative to the global prefix.
-; Default Value: none
-;prefix = /path/to/pools/$pool
-
-; Unix user/group of processes
-; Note: The user is mandatory. If the group is not set, the default user's group
-; will be used.
-user = __USER__
-group = __USER__
-
-; The address on which to accept FastCGI requests.
-; Valid syntaxes are:
-; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
-; a specific port;
-; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
-; a specific port;
-; 'port' - to listen on a TCP socket to all addresses
-; (IPv6 and IPv4-mapped) on a specific port;
-; '/path/to/unix/socket' - to listen on a unix socket.
-; Note: This value is mandatory.
-listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock
-
-; Set listen(2) backlog.
-; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 511
-
-; Set permissions for unix socket, if one is used. In Linux, read/write
-; permissions must be set in order to allow connections from a web server. Many
-; BSD-derived systems allow connections regardless of permissions.
-; Default Values: user and group are set as the running user
-; mode is set to 0660
-listen.owner = www-data
-listen.group = www-data
-;listen.mode = 0660
-; When POSIX Access Control Lists are supported you can set them using
-; these options, value is a comma separated list of user/group names.
-; When set, listen.owner and listen.group are ignored
-;listen.acl_users =
-;listen.acl_groups =
-
-; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
-; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
-; must be separated by a comma. If this value is left blank, connections will be
-; accepted from any ip address.
-; Default Value: any
-;listen.allowed_clients = 127.0.0.1
-
-; Specify the nice(2) priority to apply to the pool processes (only if set)
-; The value can vary from -19 (highest priority) to 20 (lower priority)
-; Note: - It will only work if the FPM master process is launched as root
-; - The pool processes will inherit the master process priority
-; unless it specified otherwise
-; Default Value: no set
-; process.priority = -19
-
-; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
-; or group is differrent than the master process user. It allows to create process
-; core dump and ptrace the process for the pool user.
-; Default Value: no
-; process.dumpable = yes
-
-; Choose how the process manager will control the number of child processes.
-; Possible Values:
-; static - a fixed number (pm.max_children) of child processes;
-; dynamic - the number of child processes are set dynamically based on the
-; following directives. With this process management, there will be
-; always at least 1 children.
-; pm.max_children - the maximum number of children that can
-; be alive at the same time.
-; pm.start_servers - the number of children created on startup.
-; pm.min_spare_servers - the minimum number of children in 'idle'
-; state (waiting to process). If the number
-; of 'idle' processes is less than this
-; number then some children will be created.
-; pm.max_spare_servers - the maximum number of children in 'idle'
-; state (waiting to process). If the number
-; of 'idle' processes is greater than this
-; number then some children will be killed.
-; ondemand - no children are created at startup. Children will be forked when
-; new requests will connect. The following parameter are used:
-; pm.max_children - the maximum number of children that
-; can be alive at the same time.
-; pm.process_idle_timeout - The number of seconds after which
-; an idle process will be killed.
-; Note: This value is mandatory.
-pm = dynamic
-
-; The number of child processes to be created when pm is set to 'static' and the
-; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
-; This value sets the limit on the number of simultaneous requests that will be
-; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
-; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
-; CGI. The below defaults are based on a server without much resources. Don't
-; forget to tweak pm.* to fit your needs.
-; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
-; Note: This value is mandatory.
-pm.max_children = 5
-
-; The number of child processes created on startup.
-; Note: Used only when pm is set to 'dynamic'
-; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
-pm.start_servers = 2
-
-; The desired minimum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.min_spare_servers = 1
-
-; The desired maximum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.max_spare_servers = 3
-
-; The number of seconds after which an idle process will be killed.
-; Note: Used only when pm is set to 'ondemand'
-; Default Value: 10s
-;pm.process_idle_timeout = 10s;
-
-; The number of requests each child process should execute before respawning.
-; This can be useful to work around memory leaks in 3rd party libraries. For
-; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
-; Default Value: 0
-;pm.max_requests = 500
-
-; The URI to view the FPM status page. If this value is not set, no URI will be
-; recognized as a status page. It shows the following informations:
-; pool - the name of the pool;
-; process manager - static, dynamic or ondemand;
-; start time - the date and time FPM has started;
-; start since - number of seconds since FPM has started;
-; accepted conn - the number of request accepted by the pool;
-; listen queue - the number of request in the queue of pending
-; connections (see backlog in listen(2));
-; max listen queue - the maximum number of requests in the queue
-; of pending connections since FPM has started;
-; listen queue len - the size of the socket queue of pending connections;
-; idle processes - the number of idle processes;
-; active processes - the number of active processes;
-; total processes - the number of idle + active processes;
-; max active processes - the maximum number of active processes since FPM
-; has started;
-; max children reached - number of times, the process limit has been reached,
-; when pm tries to start more children (works only for
-; pm 'dynamic' and 'ondemand');
-; Value are updated in real time.
-; Example output:
-; pool: www
-; process manager: static
-; start time: 01/Jul/2011:17:53:49 +0200
-; start since: 62636
-; accepted conn: 190460
-; listen queue: 0
-; max listen queue: 1
-; listen queue len: 42
-; idle processes: 4
-; active processes: 11
-; total processes: 15
-; max active processes: 12
-; max children reached: 0
-;
-; By default the status page output is formatted as text/plain. Passing either
-; 'html', 'xml' or 'json' in the query string will return the corresponding
-; output syntax. Example:
-; http://www.foo.bar/status
-; http://www.foo.bar/status?json
-; http://www.foo.bar/status?html
-; http://www.foo.bar/status?xml
-;
-; By default the status page only outputs short status. Passing 'full' in the
-; query string will also return status for each pool process.
-; Example:
-; http://www.foo.bar/status?full
-; http://www.foo.bar/status?json&full
-; http://www.foo.bar/status?html&full
-; http://www.foo.bar/status?xml&full
-; The Full status returns for each process:
-; pid - the PID of the process;
-; state - the state of the process (Idle, Running, ...);
-; start time - the date and time the process has started;
-; start since - the number of seconds since the process has started;
-; requests - the number of requests the process has served;
-; request duration - the duration in µs of the requests;
-; request method - the request method (GET, POST, ...);
-; request URI - the request URI with the query string;
-; content length - the content length of the request (only with POST);
-; user - the user (PHP_AUTH_USER) (or '-' if not set);
-; script - the main script called (or '-' if not set);
-; last request cpu - the %cpu the last request consumed
-; it's always 0 if the process is not in Idle state
-; because CPU calculation is done when the request
-; processing has terminated;
-; last request memory - the max amount of memory the last request consumed
-; it's always 0 if the process is not in Idle state
-; because memory calculation is done when the request
-; processing has terminated;
-; If the process is in Idle state, then informations are related to the
-; last request the process has served. Otherwise informations are related to
-; the current request being served.
-; Example output:
-; ************************
-; pid: 31330
-; state: Running
-; start time: 01/Jul/2011:17:53:49 +0200
-; start since: 63087
-; requests: 12808
-; request duration: 1250261
-; request method: GET
-; request URI: /test_mem.php?N=10000
-; content length: 0
-; user: -
-; script: /home/fat/web/docs/php/test_mem.php
-; last request cpu: 0.00
-; last request memory: 0
-;
-; Note: There is a real-time FPM status monitoring sample web page available
-; It's available in: /usr/share/php/7.0/fpm/status.html
-;
-; Note: The value must start with a leading slash (/). The value can be
-; anything, but it may not be a good idea to use the .php extension or it
-; may conflict with a real PHP file.
-; Default Value: not set
-;pm.status_path = /status
-
-; The ping URI to call the monitoring page of FPM. If this value is not set, no
-; URI will be recognized as a ping page. This could be used to test from outside
-; that FPM is alive and responding, or to
-; - create a graph of FPM availability (rrd or such);
-; - remove a server from a group if it is not responding (load balancing);
-; - trigger alerts for the operating team (24/7).
-; Note: The value must start with a leading slash (/). The value can be
-; anything, but it may not be a good idea to use the .php extension or it
-; may conflict with a real PHP file.
-; Default Value: not set
-;ping.path = /ping
-
-; This directive may be used to customize the response of a ping request. The
-; response is formatted as text/plain with a 200 response code.
-; Default Value: pong
-;ping.response = pong
-
-; The access log file
-; Default: not set
-;access.log = log/$pool.access.log
-
-; The access log format.
-; The following syntax is allowed
-; %%: the '%' character
-; %C: %CPU used by the request
-; it can accept the following format:
-; - %{user}C for user CPU only
-; - %{system}C for system CPU only
-; - %{total}C for user + system CPU (default)
-; %d: time taken to serve the request
-; it can accept the following format:
-; - %{seconds}d (default)
-; - %{miliseconds}d
-; - %{mili}d
-; - %{microseconds}d
-; - %{micro}d
-; %e: an environment variable (same as $_ENV or $_SERVER)
-; it must be associated with embraces to specify the name of the env
-; variable. Some exemples:
-; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
-; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
-; %f: script filename
-; %l: content-length of the request (for POST request only)
-; %m: request method
-; %M: peak of memory allocated by PHP
-; it can accept the following format:
-; - %{bytes}M (default)
-; - %{kilobytes}M
-; - %{kilo}M
-; - %{megabytes}M
-; - %{mega}M
-; %n: pool name
-; %o: output header
-; it must be associated with embraces to specify the name of the header:
-; - %{Content-Type}o
-; - %{X-Powered-By}o
-; - %{Transfert-Encoding}o
-; - ....
-; %p: PID of the child that serviced the request
-; %P: PID of the parent of the child that serviced the request
-; %q: the query string
-; %Q: the '?' character if query string exists
-; %r: the request URI (without the query string, see %q and %Q)
-; %R: remote IP address
-; %s: status (response code)
-; %t: server time the request was received
-; it can accept a strftime(3) format:
-; %d/%b/%Y:%H:%M:%S %z (default)
-; The strftime(3) format must be encapsuled in a %{}t tag
-; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
-; %T: time the log has been written (the request has finished)
-; it can accept a strftime(3) format:
-; %d/%b/%Y:%H:%M:%S %z (default)
-; The strftime(3) format must be encapsuled in a %{}t tag
-; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
-; %u: remote user
-;
-; Default: "%R - %u %t \"%m %r\" %s"
-;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
-
-; The log file for slow requests
-; Default Value: not set
-; Note: slowlog is mandatory if request_slowlog_timeout is set
-;slowlog = log/$pool.log.slow
-
-; The timeout for serving a single request after which a PHP backtrace will be
-; dumped to the 'slowlog' file. A value of '0s' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_slowlog_timeout = 0
-
-; The timeout for serving a single request after which the worker process will
-; be killed. This option should be used when the 'max_execution_time' ini option
-; does not stop script execution for some reason. A value of '0' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-request_terminate_timeout = 1d
-
-; Set open file descriptor rlimit.
-; Default Value: system defined value
-;rlimit_files = 1024
-
-; Set max core size rlimit.
-; Possible Values: 'unlimited' or an integer greater or equal to 0
-; Default Value: system defined value
-;rlimit_core = 0
-
-; Chroot to this directory at the start. This value must be defined as an
-; absolute path. When this value is not set, chroot is not used.
-; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
-; of its subdirectories. If the pool prefix is not set, the global prefix
-; will be used instead.
-; Note: chrooting is a great security feature and should be used whenever
-; possible. However, all PHP paths will be relative to the chroot
-; (error_log, sessions.save_path, ...).
-; Default Value: not set
-;chroot =
-
-; Chdir to this directory at the start.
-; Note: relative path can be used.
-; Default Value: current directory or / when chroot
-chdir = __FINALPATH__
-
-; Redirect worker stdout and stderr into main error log. If not set, stdout and
-; stderr will be redirected to /dev/null according to FastCGI specs.
-; Note: on highloaded environement, this can cause some delay in the page
-; process time (several ms).
-; Default Value: no
-;catch_workers_output = yes
-
-; Clear environment in FPM workers
-; Prevents arbitrary environment variables from reaching FPM worker processes
-; by clearing the environment in workers before env vars specified in this
-; pool configuration are added.
-; Setting to "no" will make all environment variables available to PHP code
-; via getenv(), $_ENV and $_SERVER.
-; Default Value: yes
-;clear_env = no
-
-; Limits the extensions of the main script FPM will allow to parse. This can
-; prevent configuration mistakes on the web server side. You should only limit
-; FPM to .php extensions to prevent malicious users to use other extensions to
-; execute php code.
-; Note: set an empty value to allow all extensions.
-; Default Value: .php
-;security.limit_extensions = .php .php3 .php4 .php5 .php7
-
-; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
-; the current environment.
-; Default Value: clean env
-;env[HOSTNAME] = $HOSTNAME
-;env[PATH] = /usr/local/bin:/usr/bin:/bin
-;env[TMP] = /tmp
-;env[TMPDIR] = /tmp
-;env[TEMP] = /tmp
-
-; Additional php.ini defines, specific to this pool of workers. These settings
-; overwrite the values previously defined in the php.ini. The directives are the
-; same as the PHP SAPI:
-; php_value/php_flag - you can set classic ini defines which can
-; be overwritten from PHP call 'ini_set'.
-; php_admin_value/php_admin_flag - these directives won't be overwritten by
-; PHP call 'ini_set'
-; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
-
-; Defining 'extension' will load the corresponding shared extension from
-; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
-; overwrite previously defined php.ini values, but will append the new value
-; instead.
-
-; Note: path INI options can be relative and will be expanded with the prefix
-; (pool, global or /usr)
-
-; Default Value: nothing is defined by default except the values in php.ini and
-; specified at startup with the -d argument
-;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
-;php_flag[display_errors] = off
-;php_admin_value[error_log] = /var/log/fpm-php.www.log
-;php_admin_flag[log_errors] = on
-;php_admin_value[memory_limit] = 32M
-
-; Common values to change to increase file upload limit
-; php_admin_value[upload_max_filesize] = 50M
-; php_admin_value[post_max_size] = 50M
-; php_admin_flag[mail.add_x_header] = Off
-
-; Other common parameters
-; php_admin_value[max_execution_time] = 600
-; php_admin_value[max_input_time] = 300
-; php_admin_value[memory_limit] = 256M
-; php_admin_flag[short_open_tag] = On
diff --git a/config_panel.toml.example b/config_panel.toml.example
deleted file mode 100644
index c6bccd8..0000000
--- a/config_panel.toml.example
+++ /dev/null
@@ -1,295 +0,0 @@
-
-## Config panel are available from webadmin > Apps > YOUR_APP > Config Panel Button
-## Those panels let user configure some params on their apps using a friendly interface,
-## and remove the need to manually edit files from the command line.
-
-## From a packager perspective, this .toml is coupled to the scripts/config script,
-## which may be used to define custom getters/setters. However, most use cases
-## should be covered automagically by the core, thus it may not be necessary
-## to define a scripts/config at all!
-
-## -----------------------------------------------------------------------------
-## IMPORTANT: In accordance with YunoHost's spirit, please keep things simple and
-## do not overwhelm the admin with tons of misunderstandable or advanced settings.
-## -----------------------------------------------------------------------------
-
-## The top level describe the entire config panels screen.
-
-## The version is a required property.
-## Here a small reminder to associate config panel version with YunoHost version
-## | Config | YNH | Config panel small change log |
-## | ------ | --- | ------------------------------------------------------- |
-## | 0.1 | 3.x | 0.1 config script not compatible with YNH >= 4.3 |
-## | 1.0 | 4.3.x | The new config panel system with 'bind' property |
-version = "1.0"
-
-## (optional) i18n property let you internationalize questions, however this feature
-## is only available in core configuration panel (like yunohost domain config).
-## So in app config panel this key is ignored for now, but you can internationalize
-## by using a lang dictionary (see property name bellow)
-# i18n = "prefix_translation_key"
-
-################################################################################
-#### ABOUT PANELS
-################################################################################
-
-## The next level describes web admin panels
-## You have to choose an ID for each panel, in this example the ID is "main"
-## Keep in mind this ID will be used in CLI to refer to your question, so choose
-## something short and meaningfull.
-## In the webadmin, each panel corresponds to a distinct tab / form
-[main]
-
-## Define the label for your panel
-## Internationalization works similarly to the 'description' and 'ask' questions in the manifest
-# name.en = "Main configuration"
-# name.fr = "Configuration principale"
-
-## (optional) If you need to trigger a service reload-or-restart after the user
-## change a question in this panel, you can add your service in the list.
-services = ["__APP__"]
-# or services = ["nginx", "__APP__"] to also reload-or-restart nginx
-
-## (optional) This help properties is a short help displayed on the same line
-## than the panel title but not displayed in the tab.
-# help = ""
-
- ############################################################################
- #### ABOUT SECTIONS
- ############################################################################
-
- ## A panel is composed of one or several sections.
- ##
- ## Sections are meant to group questions together when they correspond to
- ## a same subtopic. This impacts the rendering in terms of CLI prompts
- ## and HTML forms
- ##
- ## You should choose an ID for your section, and prefix it with the panel ID
- ## (Be sure to not make a typo in the panel ID, which would implicitly create
- ## an other entire panel)
- ##
- ## We use the context of pepettes_ynh as an example,
- ## which is a simple donation form app written in python,
- ## and for which the admin will want to edit the configuration
- [main.customization]
-
- ## (optional) Defining a proper title for sections is not mandatory
- ## and depends on the exact rendering you're aiming for the CLI / webadmin
- name = ""
-
- ## (optional) This help properties is a short help displayed on the same line
- ## than the section title, meant to provide additional details
- # help = ""
-
- ## (optional) As for panel, you can specify to trigger a service
- ## reload-or-restart after the user change a question in this section.
- ## This property is added to the panel property, it doesn't deactivate it.
- ## So no need to replicate, the service list from panel services property.
- # services = []
-
- ## (optional) By default all questions are optionals, but you can specify a
- ## default behaviour for question in the section
- optional = false
-
- ## (optional) It's also possible with the 'visible' property to only
- ## display the section depending on the user's answers to previous questions.
- ##
- ## Be careful that the 'visible' property should only refer to **previous** questions
- ## Hence, it should not make sense to have a "visible" property on the very first section.
- ##
- ## Also, keep in mind that this feature only works in the webadmin and not in CLI
- ## (therefore a user could be prompted in CLI for a question that may not be relevant)
- # visible = true
-
- ########################################################################
- #### ABOUT QUESTIONS
- ########################################################################
-
- ## A section is compound of one or several questions.
-
- ## ---------------------------------------------------------------------
- ## IMPORTANT: as for panel and section you have to choose an ID, but this
- ## one should be unique in all this document, even if the question is in
- ## an other panel.
- ## ---------------------------------------------------------------------
-
- ## You can use same questions types and properties than in manifest.yml
- ## install part. However, in YNH 4.3, a lot of change has been made to
- ## extend availables questions types list.
- ## See: TODO DOC LINK
-
- [main.customization.project_name]
-
- ## (required) The ask property is equivalent to the ask property in
- ## the manifest. However, in config panels, questions are displayed on the
- ## left side and therefore have less space to be rendered. Therefore,
- ## it is better to use a short question, and use the "help" property to
- ## provide additional details if necessary.
- ask.en = "Name of the project"
-
- ## (required) The type property indicates how the question should be
- ## displayed, validated and managed. Some types have specific properties.
- ##
- ## Types available: string, boolean, number, range, text, password, path
- ## email, url, date, time, color, select, domain, user, tags, file.
- ##
- ## For a complete list with specific properties, see: TODO DOC LINK
- type = "string"
-
- ########################################################################
- #### ABOUT THE BIND PROPERTY
- ########################################################################
-
- ## (recommended) 'bind' property is a powerful feature that let you
- ## configure how and where the data will be read, validated and written.
-
- ## By default, 'bind property is in "settings" mode, it means it will
- ## **only** read and write the value in application settings file.
- ## bind = "settings"
-
- ## However, settings usually correspond to key/values in actual app configurations
- ## Hence, a more useful mode is to have bind = ":FILENAME". In that case, YunoHost
- ## will automagically find a line with "KEY=VALUE" in FILENAME
- ## (with the adequate separator between KEY and VALUE)
- ##
- ## YunoHost will then use this value for the read/get operation.
- ## During write/set operations, YunoHost will overwrite the value
- ## in **both** FILENAME and in the app's settings.yml
-
- ## Configuration file format supported: yaml, toml, json, ini, env, php,
- ## python. The feature probably works with others formats, but should be tested carefully.
-
- ## Note that this feature only works with relatively simple cases
- ## such as `KEY: VALUE`, but won't properly work with
- ## complex data structures like multilin array/lists or dictionnaries.
- ## It also doesn't work with XML format, custom config function call, php define(), ...
-
- ## More info on TODO
- # bind = ":/var/www/__APP__/settings.py"
-
-
- ## By default, bind = ":FILENAME" will use the question ID as KEY
- ## ... but the question ID may sometime not be the exact KEY name in the configuration file.
- ##
- ## In particular, in pepettes, the python variable is 'name' and not 'project_name'
- ## (c.f. https://github.com/YunoHost-Apps/pepettes_ynh/blob/5cc2d3ffd6529cc7356ff93af92dbb6785c3ab9a/conf/settings.py##L11 )
- ##
- ## In that case, the key name can be specified before the column ':'
-
- bind = "name:/var/www/__APP__/settings.py"
-
- ## ---------------------------------------------------------------------
- ## IMPORTANT: other 'bind' mode exists:
- ##
- ## bind = "FILENAME" (with no column character before FILENAME)
- ## may be used to bind to the **entire file content** (instead of a single KEY/VALUE)
- ## This could be used to expose an entire configuration file, or binary files such as images
- ## For example:
- ## bind = "/var/www/__APP__/img/logo.png"
- ##
- ## bind = "null" can be used to disable reading / writing in settings.
- ## This creates sort of a "virtual" or "ephemeral" question which is not related to any actual setting
- ## In this mode, you are expected to define custom getter/setters/validators in scripts/config:
- ##
- ## getter: get__QUESTIONID()
- ## setter: set__QUESTIONID()
- ## validator: validate__QUESTIONID()
- ##
- ## You can also specify a common getter / setter / validator, with the
- ## function 'bind' mode, for example here it will try to run
- ## get__array_settings() first.
- # bind = "array_settings()"
- ## ---------------------------------------------------------------------
-
- ## ---------------------------------------------------------------------
- ## IMPORTANT: with the exception of bind=null questions,
- ## question IDs should almost **always** correspond to an app setting
- ## initialized / reused during install/upgrade.
- ## Not doing so may result in inconsistencies between the config panel mechanism
- ## and the use of ynh_add_config
- ## ---------------------------------------------------------------------
-
- ########################################################################
- #### OTHER GENERIC PROPERTY FOR QUESTIONS
- ########################################################################
-
- ## (optional) An help text for the question
- help = "Fill the name of the project which will received donation"
-
- ## (optional) An example display as placeholder in web form
- # example = "YunoHost"
-
- ## (optional) set to true in order to redact the value in operation logs
- # redact = false
-
- ## (optional) A validation pattern
- ## ---------------------------------------------------------------------
- ## IMPORTANT: your pattern should be between simple quote, not double.
- ## ---------------------------------------------------------------------
- pattern.regexp = '^\w{3,30}$'
- pattern.error = "The name should be at least 3 chars and less than 30 chars. Alphanumeric chars are accepted"
-
- ## Note: visible and optional properties are also available for questions
-
-
- [main.customization.contact_url]
- ask = "Contact url"
- type = "url"
- example = "mailto: contact@example.org"
- help = "mailto: accepted"
- pattern.regexp = '^mailto:[^@]+@[^@]+|https://$'
- pattern.error = "Should be https or mailto:"
- bind = ":/var/www/__APP__/settings.py"
-
- [main.customization.logo]
- ask = "Logo"
- type = "file"
- accept = ".png"
- help = "Fill with an already resized logo"
- bind = "__FINALPATH__/img/logo.png"
-
- [main.customization.favicon]
- ask = "Favicon"
- type = "file"
- accept = ".png"
- help = "Fill with an already sized favicon"
- bind = "__FINALPATH__/img/favicon.png"
-
-
- [main.stripe]
- name = "Stripe general info"
- optional = false
-
- # The next alert is overwrited with a getter from the config script
- [main.stripe.amount]
- ask = "Donation in the month : XX €
- type = "alert"
- style = "success"
-
- [main.stripe.publishable_key]
- ask = "Publishable key"
- type = "string"
- redact = true
- help = "Indicate here the stripe publishable key"
- bind = ":/var/www/__APP__/settings.py"
-
- [main.stripe.secret_key]
- ask = "Secret key"
- type = "string"
- redact = true
- help = "Indicate here the stripe secret key"
- bind = ":/var/www/__APP__/settings.py"
-
- [main.stripe.prices]
- ask = "Prices ID"
- type = "tags"
- help = """\
- Indicates here the prices ID of donation products you created in stripe interfaces. \
- Go on [Stripe products](https://dashboard.stripe.com/products) to create those donation products. \
- Fill it tag with 'FREQUENCY/CURRENCY/PRICE_ID' \
- FREQUENCY: 'one_time' or 'recuring' \
- CURRENCY: 'EUR' or 'USD' \
- PRICE_ID: ID from stripe interfaces starting with 'price_' \
- """
- pattern.regexp = '^(one_time|recuring)/(EUR|USD)/price_.*$'
- pattern.error = "Please respect the format describe in help text for each price ID"
diff --git a/doc/screenshots/BookWyrm-snap.PNG b/doc/screenshots/BookWyrm-snap.PNG
new file mode 100644
index 0000000..cbfa810
Binary files /dev/null and b/doc/screenshots/BookWyrm-snap.PNG differ
diff --git a/doc/screenshots/example.jpg b/doc/screenshots/example.jpg
deleted file mode 100644
index a1efa1a..0000000
Binary files a/doc/screenshots/example.jpg and /dev/null differ
diff --git a/manifest.json b/manifest.json
index d98ee36..7821d96 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,25 +1,24 @@
{
- "name": "Example app",
- "id": "example",
+ "name": "BookWyrm",
+ "id": "bookwyrm",
"packaging_format": 1,
"description": {
- "en": "Explain in *a few (10~15) words* the purpose of the app or what it actually does (it is meant to give a rough idea to users browsing a catalog of 100+ apps)",
- "fr": "Expliquez en *quelques* (10~15) mots l'utilité de l'app ou ce qu'elle fait (l'objectif est de donner une idée grossière pour des utilisateurs qui naviguent dans un catalogue de 100+ apps)"
+ "en": "BookWyrm is a platform for social reading. You can use it to track what you're reading, review books, and follow your friends. It isn't primarily meant for cataloguing or as a data-source for books, but it does do both of those things to some degree.",
+ "fr": "BookWyrm est une plateforme de lecture sociale. Vous pouvez l'utiliser pour suivre ce que vous lisez, critiquer des livres et suivre vos amis. Il ne s'agit pas d'un catalogue ou d'une source de données pour les livres, mais il fait ces deux choses dans une certaine mesure."
},
- "version": "1.0~ynh1",
- "url": "https://example.com",
+ "version": "0.5.3~ynh1",
+ "url": "https://github.com/bookwyrm-social/bookwyrm",
"upstream": {
- "license": "free",
- "website": "https://example.com",
- "demo": "https://demo.example.com",
- "admindoc": "https://yunohost.org/packaging_apps",
- "userdoc": "https://yunohost.org/apps",
- "code": "https://some.forge.com/example/example"
+ "license": "ANTI-CAPITALIST SOFTWARE LICENSE (v 1.4)",
+ "website": "https://joinbookwyrm.com/fr/",
+ "demo": "https://joinbookwyrm.com/fr/",
+ "admindoc": "https://docs.joinbookwyrm.com/",
+ "code": "https://github.com/bookwyrm-social/bookwyrm"
},
- "license": "free",
+ "license": "ANTI-CAPITALIST SOFTWARE LICENSE (v 1.4)",
"maintainer": {
- "name": "John doe",
- "email": "john.doe@example.com"
+ "name": "oufmilo",
+
},
"requirements": {
"yunohost": ">= 4.3.0"
@@ -27,21 +26,15 @@
"multi_instance": true,
"services": [
"nginx",
- "php7.3-fpm",
- "mysql"
+ "postgresql"
],
"arguments": {
- "install" : [
+ "install": [
{
"name": "domain",
"type": "domain"
},
- {
- "name": "path",
- "type": "path",
- "example": "/example",
- "default": "/example"
- },
+
{
"name": "is_public",
"type": "boolean",
@@ -60,14 +53,6 @@
{
"name": "admin",
"type": "user"
- },
- {
- "name": "password",
- "type": "password",
- "help": {
- "en": "Use the help field to add an information for the admin about this question.",
- "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
- }
}
]
}
diff --git a/scripts/change_url b/scripts/change_url
deleted file mode 100644
index 495b7eb..0000000
--- a/scripts/change_url
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-source _common.sh
-source /usr/share/yunohost/helpers
-
-#=================================================
-# RETRIEVE ARGUMENTS
-#=================================================
-
-old_domain=$YNH_APP_OLD_DOMAIN
-old_path=$YNH_APP_OLD_PATH
-
-new_domain=$YNH_APP_NEW_DOMAIN
-new_path=$YNH_APP_NEW_PATH
-
-app=$YNH_APP_INSTANCE_NAME
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
-
-# Needed for helper "ynh_add_nginx_config"
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-
-# Add settings here as needed by your application
-#db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-#db_user=$db_name
-#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
-
-#=================================================
-# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
- # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
- ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-
- # Restore it if the upgrade fails
- ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# CHECK WHICH PARTS SHOULD BE CHANGED
-#=================================================
-
-change_domain=0
-if [ "$old_domain" != "$new_domain" ]
-then
- change_domain=1
-fi
-
-change_path=0
-if [ "$old_path" != "$new_path" ]
-then
- change_path=1
-fi
-
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# STOP SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Stopping a systemd service..." --time --weight=1
-
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
-
-#=================================================
-# MODIFY URL IN NGINX CONF
-#=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1
-
-nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
-
-# Change the path in the NGINX config file
-if [ $change_path -eq 1 ]
-then
- # Make a backup of the original NGINX config file if modified
- ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
- # Set global variables for NGINX helper
- domain="$old_domain"
- path_url="$new_path"
- # Create a dedicated NGINX config
- ynh_add_nginx_config
-fi
-
-# Change the domain for NGINX
-if [ $change_domain -eq 1 ]
-then
- # Delete file checksum for the old conf file location
- ynh_delete_file_checksum --file="$nginx_conf_path"
- mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
- # Store file checksum for the new config file location
- ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-fi
-
-#=================================================
-# SPECIFIC MODIFICATIONS
-#=================================================
-# ...
-#=================================================
-
-#=================================================
-# GENERIC FINALISATION
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Starting a systemd service..." --time --weight=1
-
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
-
-#=================================================
-# END OF SCRIPT
-#=================================================
-
-ynh_script_progression --message="Change of URL completed for $app" --time --last
diff --git a/scripts/config b/scripts/config
deleted file mode 100644
index b9e79f8..0000000
--- a/scripts/config
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-# In simple cases, you don't need a config script.
-
-# With a simple config_panel.toml, you can write in the app settings, in the
-# upstream config file or replace complete files (logo ...) and restart services.
-
-# The config scripts allows you to go further, to handle specific cases
-# (validation of several interdependent fields, specific getter/setter for a value,
-# display dynamic informations or choices, pre-loading of config type .cube... ).
-
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-source /usr/share/yunohost/helpers
-
-ynh_abort_if_errors
-
-#=================================================
-# RETRIEVE ARGUMENTS
-#=================================================
-
-final_path=$(ynh_app_setting_get $app final_path)
-
-#=================================================
-# SPECIFIC GETTERS FOR TOML SHORT KEY
-#=================================================
-
-get__amount() {
- # Here we can imagine to have an API call to stripe to know the amount of donation during a month
- local amount = 200
-
- # It's possible to change some properties of the question by overriding it:
- if [ $amount -gt 100 ]
- then
- cat << EOF
-style: success
-value: $amount
-ask:
- en: A lot of donation this month: **$amount €**
-EOF
- else
- cat << EOF
-style: danger
-value: $amount
-ask:
- en: Not so much donation this month: $amount €
-EOF
- fi
-}
-
-get__prices() {
- local prices = "$(grep "DONATION\['" "$final_path/settings.py" | sed -r "s@^DONATION\['([^']*)'\]\['([^']*)'\] = '([^']*)'@\1/\2/\3@g" | sed -z 's/\n/,/g;s/,$/\n/')"
- if [ "$prices" == "," ];
- then
- # Return YNH_NULL if you prefer to not return a value at all.
- echo YNH_NULL
- else
- echo $prices
- fi
-}
-
-
-#=================================================
-# SPECIFIC VALIDATORS FOR TOML SHORT KEYS
-#=================================================
-validate__publishable_key() {
-
- # We can imagine here we test if the key is really a publisheable key
- (is_secret_key $publishable_key) &&
- echo 'This key seems to be a secret key'
-}
-
-#=================================================
-# SPECIFIC SETTERS FOR TOML SHORT KEYS
-#=================================================
-set__prices() {
-
- #---------------------------------------------
- # IMPORTANT: setter are trigger only if a change is detected
- #---------------------------------------------
- for price in $(echo $prices | sed "s/,/ /"); do
- frequency=$(echo $price | cut -d/ -f1)
- currency=$(echo $price | cut -d/ -f2)
- price_id=$(echo $price | cut -d/ -f3)
- sed "d/DONATION\['$frequency'\]\['$currency'\]" "$final_path/settings.py"
-
- echo "DONATION['$frequency']['$currency'] = '$price_id'" >> "$final_path/settings.py"
- done
-
- #---------------------------------------------
- # IMPORTANT: to be able to upgrade properly, you have to saved the value in settings too
- #---------------------------------------------
- ynh_app_setting_set $app prices $prices
-}
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-ynh_app_config_run $1
diff --git a/scripts/install b/scripts/install
index 97c0584..dce9e2f 100755
--- a/scripts/install
+++ b/scripts/install
@@ -25,39 +25,21 @@ ynh_abort_if_errors
#=================================================
domain=$YNH_APP_ARG_DOMAIN
-path_url=$YNH_APP_ARG_PATH
+path_url="/"
is_public=$YNH_APP_ARG_IS_PUBLIC
language=$YNH_APP_ARG_LANGUAGE
admin=$YNH_APP_ARG_ADMIN
-password=$YNH_APP_ARG_PASSWORD
-### If it's a multi-instance app, meaning it can be installed several times independently
-### The id of the app as stated in the manifest is available as $YNH_APP_ID
-### The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2"...)
-### The app instance name is available as $YNH_APP_INSTANCE_NAME
-### - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample
-### - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2
-### - ynhexample__{N} for the subsequent installations, with N=3,4...
-### The app instance name is probably what interests you most, since this is
-### guaranteed to be unique. This is a good unique identifier to define installation path,
-### db names...
app=$YNH_APP_INSTANCE_NAME
+admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
+
#=================================================
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
#=================================================
-### About --weight and --time
-### ynh_script_progression will show to your final users the progression of each scripts.
-### In order to do that, --weight will represent the relative time of execution compared to the other steps in the script.
-### --time is a packager option, it will show you the execution time since the previous call.
-### This option should be removed before releasing your app.
-### Use the execution time, given by --time, to estimate the weight of a step.
-### A common way to do it is to set a weight equal to the execution time in second +1.
-### The execution time is given for the duration since the previous call. So the weight should be applied to this previous call.
-ynh_script_progression --message="Validating installation parameters..." --time --weight=1
+ynh_script_progression --message="Validating installation parameters..." --weight=1
+
-### If the app uses NGINX as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app".
-### If the app provides an internal web server (or uses another application server such as uWSGI), the final path should be "/opt/yunohost/$app"
final_path=/var/www/$app
test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
@@ -67,7 +49,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
#=================================================
# STORE SETTINGS FROM MANIFEST
#=================================================
-ynh_script_progression --message="Storing installation settings..." --time --weight=1
+ynh_script_progression --message="Storing installation settings..." --weight=1
ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url
@@ -79,44 +61,23 @@ ynh_app_setting_set --app=$app --key=admin --value=$admin
#=================================================
# FIND AND OPEN A PORT
#=================================================
-ynh_script_progression --message="Finding an available port..." --time --weight=1
+ynh_script_progression --message="Finding an available port..." --weight=1
-### Use these lines if you have to open a port for the application
-### `ynh_find_port` will find the first available port starting from the given port.
-### If you're not using these lines:
-### - Remove the section "CLOSE A PORT" in the remove script
-# Find an available port
port=$(ynh_find_port --port=8095)
ynh_app_setting_set --app=$app --key=port --value=$port
-# Optional: Expose this port publicly
-# (N.B.: you only need to do this if the app actually needs to expose the port publicly.
-# If you do this and the app doesn't actually need you are CREATING SECURITY HOLES IN THE SERVER !)
-
-# Open the port
-# ynh_script_progression --message="Configuring firewall..." --time --weight=1
-# ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port
-
#=================================================
# INSTALL DEPENDENCIES
#=================================================
-ynh_script_progression --message="Installing dependencies..." --time --weight=1
-
-### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package.
-### Those deb packages will be installed as dependencies of this package.
-### If you're not using this helper:
-### - Remove the section "REMOVE DEPENDENCIES" in the remove script
-### - Remove the variable "pkg_dependencies" in _common.sh
-### - As well as the section "REINSTALL DEPENDENCIES" in the restore script
-### - And the section "UPGRADE DEPENDENCIES" in the upgrade script
+ynh_script_progression --message="Installing dependencies..." --weight=1
ynh_install_app_dependencies $pkg_dependencies
#=================================================
# CREATE DEDICATED USER
#=================================================
-ynh_script_progression --message="Configuring system user..." --time --weight=1
+ynh_script_progression --message="Configuring system user..." --weight=1
# Create a system user
ynh_system_user_create --username=$app --home_dir="$final_path"
@@ -124,7 +85,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
#=================================================
# CREATE A MYSQL DATABASE
#=================================================
-ynh_script_progression --message="Creating a MySQL database..." --time --weight=1
+ynh_script_progression --message="Creating a MySQL database..." --weight=1
### Use these lines if you need a database for the application.
### `ynh_mysql_setup_db` will create a database, an associated user and a ramdom password.
@@ -143,7 +104,7 @@ ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
-ynh_script_progression --message="Setting up source files..." --time --weight=1
+ynh_script_progression --message="Setting up source files..." --weight=1
### `ynh_setup_source` is used to install an app from a zip or tar.gz file,
### downloaded from an upstream source, like a git repository.
@@ -163,20 +124,10 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path"
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --time --weight=1
-
-### `ynh_add_nginx_config` will use the file conf/nginx.conf
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
#=================================================
# PHP-FPM CONFIGURATION
#=================================================
-ynh_script_progression --message="Configuring PHP-FPM..." --time --weight=1
+ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
### `ynh_add_fpm_config` is used to set up a PHP config.
### You can remove it if your app doesn't use PHP.
@@ -192,6 +143,16 @@ ynh_script_progression --message="Configuring PHP-FPM..." --time --weight=1
# Create a dedicated PHP-FPM config
ynh_add_fpm_config
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+
+### `ynh_add_nginx_config` will use the file conf/nginx.conf
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
#=================================================
# SPECIFIC SETUP
#=================================================
@@ -201,7 +162,7 @@ ynh_add_fpm_config
#=================================================
# CREATE DATA DIRECTORY
#=================================================
-ynh_script_progression --message="Creating a data directory..." --time --weight=1
+ynh_script_progression --message="Creating a data directory..." --weight=1
### Use these lines if you need to create a directory to store "persistent files" for the application.
### Usually this directory is used to store uploaded files or any file that won't be updated during
@@ -229,7 +190,7 @@ chown -R $app:www-data "$datadir"
#=================================================
# ADD A CONFIGURATION
#=================================================
-ynh_script_progression --message="Adding a configuration file..." --time --weight=1
+ynh_script_progression --message="Adding a configuration file..." --weight=1
### You can add specific configuration files.
###
@@ -261,7 +222,7 @@ chown $app:$app "$final_path/some_config_file"
#=================================================
# SETUP SYSTEMD
#=================================================
-ynh_script_progression --message="Configuring a systemd service..." --time --weight=1
+ynh_script_progression --message="Configuring a systemd service..." --weight=1
### `ynh_systemd_config` is used to configure a systemd script for an app.
### It can be used for apps that use sysvinit (with adaptation) or systemd.
@@ -287,12 +248,12 @@ ynh_add_systemd_config
### forms.
# Set the app as temporarily public for curl call
-ynh_script_progression --message="Configuring SSOwat..." --time --weight=1
+ynh_script_progression --message="Configuring SSOwat..." --weight=1
# Making the app public for curl
ynh_permission_update --permission="main" --add="visitors"
# Installation with curl
-ynh_script_progression --message="Finalizing installation..." --time --weight=1
+ynh_script_progression --message="Finalizing installation..." --weight=1
ynh_local_curl "/INSTALL_PATH" "key1=value1" "key2=value2" "key3=value3"
# Remove the public access
@@ -303,7 +264,7 @@ ynh_permission_update --permission="main" --remove="visitors"
#=================================================
# SETUP LOGROTATE
#=================================================
-ynh_script_progression --message="Configuring log rotation..." --time --weight=1
+ynh_script_progression --message="Configuring log rotation..." --weight=1
### `ynh_use_logrotate` is used to configure a logrotate configuration for the logs of this app.
### Use this helper only if there is effectively a log file for this app.
@@ -319,7 +280,7 @@ ynh_use_logrotate
#=================================================
# INTEGRATE SERVICE IN YUNOHOST
#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
### `yunohost service add` integrates a service in YunoHost. It then gets
### displayed in the admin interface and through the others `yunohost service` commands.
@@ -351,7 +312,7 @@ yunohost service add $app --description="A short description of the app" --log="
#=================================================
# START SYSTEMD SERVICE
#=================================================
-ynh_script_progression --message="Starting a systemd service..." --time --weight=1
+ynh_script_progression --message="Starting a systemd service..." --weight=1
### `ynh_systemd_action` is used to start a systemd service for an app.
### Only needed if you have configure a systemd service
@@ -367,7 +328,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap
#=================================================
# SETUP FAIL2BAN
#=================================================
-ynh_script_progression --message="Configuring Fail2Ban..." --time --weight=1
+ynh_script_progression --message="Configuring Fail2Ban..." --weight=1
# Create a dedicated Fail2Ban config
ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login"
@@ -375,7 +336,7 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failreg
#=================================================
# SETUP SSOWAT
#=================================================
-ynh_script_progression --message="Configuring permissions..." --time --weight=1
+ynh_script_progression --message="Configuring permissions..." --weight=1
# Make app public if necessary
if [ $is_public -eq 1 ]
@@ -399,7 +360,7 @@ ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --sho
#=================================================
# RELOAD NGINX
#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload
@@ -407,4 +368,4 @@ ynh_systemd_action --service_name=nginx --action=reload
# END OF SCRIPT
#=================================================
-ynh_script_progression --message="Installation of $app completed" --time --last
+ynh_script_progression --message="Installation of $app completed" --last