From cf27ba1a3b8bb5b550100b834f7e28be9cf6c883 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Mon, 11 Jul 2016 18:27:25 +0200 Subject: [PATCH 01/12] Update nginx.conf --- conf/nginx.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 599c1bd..76bad6c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,11 +5,11 @@ location YNH_WWW_PATH { # Example PHP configuration (remove if not used) index index.php; - rewrite ^/(/bbs/img/.*)$ /$1 break; - rewrite ^/(/bbs/js/.*)$ /$1 break; - rewrite ^/(/bbs/style/.*)$ /$1 break; - rewrite ^/bbs/$ /bbs/index.php last; - rewrite ^/bbs/(admin|authors|authorslist|login|logout|metadata|search|series|serieslist|tags|tagslist|titles|titleslist|opds)/.*$ /bbs/index.php last; + rewrite ^/(YNH_WWW_PATH/img/.*)$ /$1 break; + rewrite ^/(YNH_WWW_PATH/js/.*)$ /$1 break; + rewrite ^/(YNH_WWW_PATH/style/.*)$ /$1 break; + rewrite ^YNH_WWW_PATH/$ YNH_WWW_PATH/index.php last; + rewrite ^YNH_WWW_PATH/(admin|authors|authorslist|login|logout|metadata|search|series|serieslist|tags|tagslist|titles|titleslist|opds)/.*$ /bbs/index.php last; # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file #client_max_body_size 50M; From 57a30e207e138c51103ca324b2c23e3e21dd98b6 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Mon, 11 Jul 2016 18:28:01 +0200 Subject: [PATCH 02/12] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f84f7c2..8e48578 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "BicBucStriim", - "id": "bbs", + "id": "bicbucstriim", "packaging_format": 1, "description": { "en": "BicBucStriim streams books, digital books, providing web-based access to your e-book collection.", From d4f5399a07e2ea96a22a08c7b575d94a7b5bae32 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Mon, 11 Jul 2016 18:59:12 +0200 Subject: [PATCH 03/12] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 76bad6c..aafbd3e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,7 +9,7 @@ location YNH_WWW_PATH { rewrite ^/(YNH_WWW_PATH/js/.*)$ /$1 break; rewrite ^/(YNH_WWW_PATH/style/.*)$ /$1 break; rewrite ^YNH_WWW_PATH/$ YNH_WWW_PATH/index.php last; - rewrite ^YNH_WWW_PATH/(admin|authors|authorslist|login|logout|metadata|search|series|serieslist|tags|tagslist|titles|titleslist|opds)/.*$ /bbs/index.php last; + rewrite ^YNH_WWW_PATH/(admin|authors|authorslist|login|logout|metadata|search|series|serieslist|tags|tagslist|titles|titleslist|opds)/.*$ YNH_WWW_PATH/index.php last; # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file #client_max_body_size 50M; From 9bcbb413730831008b9222b69fdab34b1a1995ac Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Mon, 11 Jul 2016 19:04:27 +0200 Subject: [PATCH 04/12] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index cb83947..a092b10 100644 --- a/scripts/install +++ b/scripts/install @@ -59,4 +59,4 @@ fi # Reload services sudo service nginx reload -echo "Open $domain/$app/installcheck.php for troubleshooting guide." +echo "Open $domain/$path/installcheck.php for troubleshooting guide." From 29c36ee6cd37e7aa3aab56394e0a5a6061ab04b3 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Mon, 11 Jul 2016 20:03:09 +0200 Subject: [PATCH 05/12] Disable BicBucStriim login if needed --- scripts/install | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/install b/scripts/install index a092b10..7eb888f 100644 --- a/scripts/install +++ b/scripts/install @@ -19,6 +19,7 @@ domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC +login=$YNH_APP_ARG_LOGIN # Source YunoHost helpers source /usr/share/yunohost/helpers @@ -40,6 +41,11 @@ sudo cp -R "$src_path"/BicBucStriim-1.3.6/* "$src_path" sudo rm "$src_path"/bbs.zip sudo rm -rf "$src_path"/BicBucStriim-1.3.6 +# Disable BicBucStriim login if checked +if [[ $login -eq 1 ]]; then + sudo sed -i -- 's/[LOGIN_REQUIRED] = 1/[LOGIN_REQUIRED] = 0/g' "$src_path"/index.php +fi + # Set permissions to app files sudo chown -R root: $src_path sudo chmod -R ga+w $src_path/data From 8b63ff0a54f2fcf2d0ddb45bb4e6994c24ccc352 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Mon, 11 Jul 2016 20:06:24 +0200 Subject: [PATCH 06/12] Add "Disable BicBucStriim login" option --- manifest.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/manifest.json b/manifest.json index 8e48578..52a2847 100644 --- a/manifest.json +++ b/manifest.json @@ -52,6 +52,15 @@ }, "example": "johndoe" }, + { + "name": "login", + "type": "boolean", + "ask": { + "en": "Disable BicBucStriim login ?", + "fr": "Désactiver l'authentification BicBucStriim ?" + }, + "default": true + }, { "name": "is_public", "type": "boolean", From b13af1c2c7618d1a133dd5fc2588aa2461324f75 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Tue, 12 Jul 2016 15:40:51 +0200 Subject: [PATCH 07/12] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 7eb888f..2ab48ad 100644 --- a/scripts/install +++ b/scripts/install @@ -65,4 +65,4 @@ fi # Reload services sudo service nginx reload -echo "Open $domain/$path/installcheck.php for troubleshooting guide." +echo "Open $domain$path/installcheck.php for troubleshooting guide." From 57f252746ff5f85386d0bafa89fc6e6ed89b75f4 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Tue, 12 Jul 2016 16:39:02 +0200 Subject: [PATCH 08/12] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 52a2847..c0ce64d 100644 --- a/manifest.json +++ b/manifest.json @@ -59,7 +59,7 @@ "en": "Disable BicBucStriim login ?", "fr": "Désactiver l'authentification BicBucStriim ?" }, - "default": true + "default": false }, { "name": "is_public", From 34f5185c262486b1b9eeeecf1a7ce095b2b33478 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Tue, 12 Jul 2016 16:45:05 +0200 Subject: [PATCH 09/12] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index c0ce64d..52a2847 100644 --- a/manifest.json +++ b/manifest.json @@ -59,7 +59,7 @@ "en": "Disable BicBucStriim login ?", "fr": "Désactiver l'authentification BicBucStriim ?" }, - "default": false + "default": true }, { "name": "is_public", From f372366b0626330b02d448de05ad3a4cb554dc68 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Tue, 12 Jul 2016 16:45:52 +0200 Subject: [PATCH 10/12] Unused file --- conf/php-fpm.conf | 250 ---------------------------------------------- 1 file changed, 250 deletions(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 2061166..8b13789 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -1,251 +1 @@ -; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the -; pool name ('www' here) -[YNH_WWW_APP] - -; Per pool prefix -; It only applies on the following directives: -; - '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 - -; 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 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses on a -; specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /var/run/php5-fpm-YNH_WWW_APP.sock - -; Set listen(2) backlog. A value of '-1' means unlimited. -; Default Value: 128 (-1 on FreeBSD and OpenBSD) -;listen.backlog = -1 - -; List of ipv4 addresses 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 - -; 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 0666 -listen.owner = www-data -listen.group = www-data -listen.mode = 0600 - -; 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 = www-data -group = www-data - -; 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: -; 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. -; 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 to be created when pm is set to 'dynamic'. -; 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. -; Note: Used when pm is set to either 'static' or 'dynamic' -; Note: This value is mandatory. -pm.max_children = 6 - -; 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 = 3 - -; 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 = 3 - -; 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 = 5 - -; 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. By default, the status page shows the following -; information: -; accepted conn - the number of request accepted by the pool; -; pool - the name of the pool; -; process manager - static or dynamic; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes. -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic') -; The values of 'idle processes', 'active processes' and 'total processes' are -; updated each second. The value of 'accepted conn' is updated in real time. -; Example output: -; accepted conn: 12073 -; pool: www -; process manager: static -; idle processes: 35 -; active processes: 65 -; total processes: 100 -; max children reached: 1 -; By default the status page output is formatted as text/plain. Passing either -; 'html' or 'json' as a 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 -; 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 = /fpm-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 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 = 120s - -; 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 = 5s - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -slowlog = /var/log/nginx/YNH_WWW_APP.slow.log - -; Set open file descriptor rlimit. -; Default Value: system defined value -rlimit_files = 4096 - -; 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 = /var/www/YNH_WWW_ALIAS - -; 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 - -; 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_value[upload_max_filesize] = 50M -;php_value[post_max_size] = 50M -;php_value[mail.add_x_header] = Off - -# Other common parameters -;php_value[max_execution_time] = 600 -;php_value[max_input_time] = 300 -;php_value[memory_limit] = 256M -;php_value[short_open_tag] = On From 6fa2ac8c0afa953a0409b828d66b0024ce9811b2 Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Tue, 12 Jul 2016 16:46:07 +0200 Subject: [PATCH 11/12] Delete php-fpm.conf --- conf/php-fpm.conf | 1 - 1 file changed, 1 deletion(-) delete mode 100644 conf/php-fpm.conf diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index 8b13789..0000000 --- a/conf/php-fpm.conf +++ /dev/null @@ -1 +0,0 @@ - From 72fce9ff2bb84cd6908c910842ad3eb6b9a699fa Mon Sep 17 00:00:00 2001 From: likeitneverwentaway Date: Tue, 12 Jul 2016 16:49:46 +0200 Subject: [PATCH 12/12] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 2ab48ad..e717c6f 100644 --- a/scripts/install +++ b/scripts/install @@ -43,7 +43,7 @@ sudo rm -rf "$src_path"/BicBucStriim-1.3.6 # Disable BicBucStriim login if checked if [[ $login -eq 1 ]]; then - sudo sed -i -- 's/[LOGIN_REQUIRED] = 1/[LOGIN_REQUIRED] = 0/g' "$src_path"/index.php + sudo sed -i -- 's/\[LOGIN_REQUIRED\] = 1/\[LOGIN_REQUIRED\] = 0/g' "$src_path"/index.php fi # Set permissions to app files