diff --git a/check_process b/check_process index 992e0b1..6e1fdb2 100644 --- a/check_process +++ b/check_process @@ -1,5 +1,4 @@ ;; Test complet - auto_remove=1 ; Manifest domain="domain.tld" (DOMAIN) path="/path" (PATH) @@ -11,18 +10,15 @@ setup_sub_dir=1 setup_root=1 setup_nourl=0 - setup_private=0 + setup_private=1 setup_public=0 upgrade=1 + upgrade=1 from_commit=546fd17712c7a9df428a4f26e7f8e4394884aaaf backup_restore=1 multi_instance=0 - wrong_user=0 - wrong_path=1 incorrect_path=1 - corrupt_source=0 - fail_download_source=0 port_already_use=0 - final_path_already_use=0 + change_url=0 ;;; Levels Level 1=auto Level 2=auto @@ -33,4 +29,8 @@ Level 7=auto Level 8=0 Level 9=0 - Level 10=0 + Level 10=0 +;;; Upgrade options + ; commit=546fd17712c7a9df428a4f26e7f8e4394884aaaf + name=29 Jan 2019 + manifest_arg=domain=DOMAIN&path=PATH&wifi_ssid="myNeutralNetwork"&wifi_passphrase=PASSWORD&firmware_nonfree="no" \ No newline at end of file diff --git a/conf/iw_devices b/conf/iw_devices index ffb2c17..1f4dff6 100644 --- a/conf/iw_devices +++ b/conf/iw_devices @@ -17,4 +17,4 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -echo -n $(iw dev | grep Interface | grep -v 'mon\.' | grep -v hotspot | awk '{ print $NF }') | tr ' ' \| +echo -n $(/sbin/iw dev | grep Interface | grep -v 'mon\.' | grep -v hotspot | awk '{ print $NF }') | tr ' ' \| diff --git a/conf/iw_multissid b/conf/iw_multissid index d3f9b1a..66ab148 100644 --- a/conf/iw_multissid +++ b/conf/iw_multissid @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -phy=$(iw "${1}" info | grep wiphy | awk '{ print $NF }') -multissid=$(iw "phy${phy}" info | grep -A1 'valid interface combinations' | tail -n1 | sed 's/.*{.*AP.*}\s<=\s\(.*\),.*/\1/') +phy=$(/sbin/iw "${1}" info | grep wiphy | awk '{ print $NF }') +multissid=$(/sbin/iw "phy${phy}" info | grep -A1 'valid interface combinations' | tail -n1 | sed 's/.*{.*AP.*}\s<=\s\(.*\),.*/\1/') if [ -z "${multissid}" ]; then echo 1 diff --git a/conf/iw_ssids b/conf/iw_ssids index 5c1c9d3..f4c8d1e 100644 --- a/conf/iw_ssids +++ b/conf/iw_ssids @@ -17,4 +17,4 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -echo -n hotspot0 $(iw dev | grep Interface | grep hotspot | awk '{ print $NF }') | tr ' ' \| +echo -n hotspot0 $(/sbin/iw dev | grep Interface | grep hotspot | awk '{ print $NF }') | tr ' ' \| diff --git a/conf/nginx_wifiadmin.conf b/conf/nginx.conf similarity index 80% rename from conf/nginx_wifiadmin.conf rename to conf/nginx.conf index 72e1b62..afdf94f 100644 --- a/conf/nginx_wifiadmin.conf +++ b/conf/nginx.conf @@ -15,20 +15,28 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -location { - alias ; +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { + # Path to source + alias __FINALPATH__/ ; + + # Force usage of https if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } + # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file client_max_body_size 10G; + index index.php; + try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php5-fpm-.sock; + fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; + fastcgi_index index.php; include fastcgi_params; fastcgi_read_timeout 600; @@ -37,5 +45,6 @@ location { fastcgi_param SCRIPT_FILENAME $request_filename; } + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf new file mode 100644 index 0000000..0c3da6c --- /dev/null +++ b/conf/php-fpm.conf @@ -0,0 +1,431 @@ +; 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/php7.0-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_value[upload_max_filesize] = 10G +php_value[post_max_size] = 10G +; php_admin_flag[mail.add_x_header] = Off + +; Other common parameters +php_value[max_execution_time] = 600 +; php_admin_value[max_input_time] = 300 +; php_admin_value[memory_limit] = 256M +; php_admin_flag[short_open_tag] = On + diff --git a/conf/phpfpm_wifiadmin.conf b/conf/phpfpm_wifiadmin.conf deleted file mode 100644 index 7c85433..0000000 --- a/conf/phpfpm_wifiadmin.conf +++ /dev/null @@ -1,202 +0,0 @@ -; Wifi Hotspot app for YunoHost -; Copyright (C) 2015 Julien Vaubourg -; Contribute at https://github.com/labriqueinternet/hotspot_ynh -; -; This program is free software: you can redistribute it and/or modify -; it under the terms of the GNU Affero General Public License as published by -; the Free Software Foundation, either version 3 of the License, or -; (at your option) any later version. -; -; This program is distributed in the hope that it will be useful, -; but WITHOUT ANY WARRANTY; without even the implied warranty of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -; GNU Affero General Public License for more details. -; -; You should have received a copy of the GNU Affero General Public License -; along with this program. If not, see . - -; Start a new pool named ''. -; the variable $pool can we used in any directive and will be replaced by the -; pool name ('www' here) -[] - -; 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-.sock - -; 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 = -group = - -; 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 - -; 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 = 600s - -; 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 log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -slowlog = /var/log/nginx/.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 - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = - -; 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 = no - -; 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) - -php_value[max_execution_time] = 600 -php_value[upload_max_filesize] = 10G -php_value[post_max_size] = 10G diff --git a/conf/ynh-hotspot.service b/conf/systemd.service similarity index 100% rename from conf/ynh-hotspot.service rename to conf/systemd.service diff --git a/conf/ynh-hotspot b/conf/ynh-hotspot index 3de7726..7149fca 100644 --- a/conf/ynh-hotspot +++ b/conf/ynh-hotspot @@ -275,10 +275,10 @@ devfromid() { if [ "$1" != restart ]; then - # Restart php5-fpm at the first start (it needs to be restarted after the slapd start) + # Restart php7.0-fpm at the first start (it needs to be restarted after the slapd start) if [ ! -e /tmp/.ynh-hotspot-boot ]; then touch /tmp/.ynh-hotspot-boot - systemctl restart php5-fpm + systemctl restart php7.0-fpm fi # Variables diff --git a/manifest.json b/manifest.json index 97b6b4c..7eb76f3 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,8 @@ }, "multi_instance": false, "services": [ - "php5-fpm" + "nginx", + "php7.0-fpm" ], "arguments": { "install" : [ @@ -64,13 +65,12 @@ { "name": "firmware_nonfree", "type": "string", - "choice": ["yes", "no"], "ask": { "en": "Install non-free firmwares - in addition to the free ones - for the wifi dongle (yes/no)", "fr": "Installer des firmwares non-libres (en plus des libres) pour la clé USB wifi (yes/no)" }, - "example": "yes", - "default": "yes" + "choice": [ "yes", "no" ], + "default": "no" } ] } diff --git a/scripts/backup b/scripts/backup index f495de7..a5790dd 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,14 +1,12 @@ #!/bin/bash -# nothing to do... - #================================================= # GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= -source _common.sh +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= @@ -17,3 +15,78 @@ source /usr/share/yunohost/helpers # Exit if an error occurs during the execution of the script ynh_abort_if_errors + +#================================================= +# LOAD SETTINGS +#================================================= +ynh_print_info "Loading installation settings..." + +app=$YNH_APP_INSTANCE_NAME + +final_path=$(ynh_app_setting_get $app final_path) +domain=$(ynh_app_setting_get $app domain) +firmware_nonfree=$(ynh_app_setting_get $app firmware_nonfree) +service_name=$(ynh_app_setting_get $app service_name) + +#================================================= +# STANDARD BACKUP STEPS +#================================================= +# BACKUP THE APP MAIN DIR +#================================================= +ynh_print_info "Backing up the main app directory..." + +ynh_backup "$final_path" + +if [[ $firmware_nonfree -eq 0 ]]; then + ynh_backup "/lib/firmware/htc_7010.fw" + ynh_backup "/lib/firmware/htc_9271.fw" +fi + +ynh_backup "/etc/sudoers.d/${app}_ynh" + +ynh_backup "/usr/local/bin/iw_multissid" +ynh_backup "/usr/local/bin/iw_devices" +ynh_backup "/usr/local/bin/iw_ssids" +ynh_backup "/usr/local/bin/ipv6_expanded" +ynh_backup "/usr/local/bin/ipv6_compressed" + +for FILE in $(ls /etc/hostapd/hostapd.conf{.tpl?,} 2>/dev/null) +do + ynh_backup "$FILE" +done +ynh_backup "/etc/dnsmasq.dhcpd/dhcpdv6.conf.tpl" +ynh_backup "/etc/dnsmasq.dhcpd/dhcpdv4.conf.tpl" + +ynh_backup "/usr/local/bin/$service_name" + +ynh_backup "/etc/init.d/hostapd" + + +#================================================= +# BACKUP THE NGINX CONFIGURATION +#================================================= +ynh_print_info "Backing up nginx web server configuration..." + +ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" + +#================================================= +# BACKUP THE PHP-FPM CONFIGURATION +#================================================= +ynh_print_info "Backing up php-fpm configuration..." + +ynh_backup "/etc/php/7.0/fpm/pool.d/$app.conf" + +#================================================= +# SPECIFIC BACKUP +#================================================= +# BACKUP SYSTEMD +#================================================= +ynh_print_info "Backing up systemd configuration..." + +ynh_backup "/etc/systemd/system/$service_name.service" + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/install b/scripts/install index a483aa0..88d7267 100644 --- a/scripts/install +++ b/scripts/install @@ -45,7 +45,6 @@ wifi_passphrase=$YNH_APP_ARG_WIFI_PASSPHRASE firmware_nonfree=$YNH_APP_ARG_FIRMWARE_NONFREE app=$YNH_APP_INSTANCE_NAME -sysuser="${app}" # the service name must match the service template files service_name='ynh-hotspot' @@ -53,56 +52,31 @@ service_name='ynh-hotspot' #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= +ynh_print_info "Validating installation parameters..." # Check destination directory final_path="/var/www/$app" test ! -e "$final_path" || ynh_die "This path already contains a folder" # Normalize the url path syntax -path_url=$(ynh_normalize_url_path "$path_url") +path_url=$(ynh_normalize_url_path $path_url) -# Check web path availability -ynh_webpath_available "$domain" "$path_url" # Register (book) web path -ynh_webpath_register "$app" "$domain" "$path_url" +ynh_webpath_register $app $domain $path_url # If we're on armbian, force $firmware_nonfree # because armbian-firmware conflicts with the non-free packages ... if dpkg --list | grep -q armbian-firmware; then echo "You are running Armbian and non-free firmware are known to conflict with armbian-firwmare. " >&2 - firmware_nonfree="no" + firmware_nonfree=0 echo "Variable firmware_non_free has been forced to 'no'" >&2 fi -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= - -ynh_app_setting_set "$app" domain "$domain" -ynh_app_setting_set "$app" final_path "$final_path" -ynh_app_setting_set "$app" wifi_ssid "$wifi_ssid" -ynh_app_setting_set "$app" wifi_passphrase "$wifi_passphrase" -ynh_app_setting_set "$app" firmware_nonfree "$firmware_nonfree" - -#================================================= -# STANDARD MODIFICATIONS -#================================================= -# INSTALL DEPENDENCIES -#================================================= - -ynh_install_app_dependencies "$pkg_dependencies" - -#================================================= -# SPECIFIC SETUP -#================================================= -# RUN PREREQUISITES -#================================================= - -source ./prerequisites - -#================================================= -# CHECK PARAMETERS -#================================================= +if [ $firmware_nonfree = "no" ]; then + firmware_nonfree=0 +elif [ $firmware_nonfree = "yes" ]; then + firmware_nonfree=1 +fi # Check arguments if [[ -z $wifi_ssid || -z $wifi_passphrase ]]; then @@ -120,6 +94,34 @@ if [[ $wifi_passphrase =~ [^[:print:]] ]]; then ynh_die "Only printable ASCII characters are permitted in your password (WPA2 passphrase)" fi +#================================================= +# RUN PREREQUISITES +#================================================= + +source ./prerequisites + +#================================================= +# STORE SETTINGS FROM MANIFEST +#================================================= +ynh_print_info "Storing installation settings..." + +ynh_app_setting_set "$app" domain "$domain" +ynh_app_setting_set "$app" final_path "$final_path" +ynh_app_setting_set "$app" wifi_ssid "$wifi_ssid" +ynh_app_setting_set "$app" wifi_passphrase "$wifi_passphrase" +ynh_app_setting_set "$app" firmware_nonfree "$firmware_nonfree" + +#================================================= +# STANDARD MODIFICATIONS +#================================================= +# FIND AND OPEN A PORT +#================================================= +ynh_print_info "Configuring firewall..." + +# Update firewall for DHCP +ynh_exec_warn_less yunohost firewall allow --no-upnp --ipv6 UDP 547 +ynh_exec_warn_less yunohost firewall allow --no-upnp UDP 67 + #================================================= # INSTALL NONFREE FIRWARE IF REQUESTED #================================================= @@ -128,7 +130,7 @@ export DEBIAN_FRONTEND=noninteractive # Packaged USB Wireless Device firmwares # Based on https://wiki.debian.org/WiFi#USB_Devices -if [[ $firmware_nonfree == yes ]]; then +if [[ $firmware_nonfree -eq 1 ]]; then # check if non-free is set on sources.list if ! grep -q non-free /etc/apt/sources.list ; then sed '/debian/{s/main/& non-free/}' -i /etc/apt/sources.list @@ -146,24 +148,58 @@ else install -b -o root -g root -m 0644 ../conf/firmware_htc-9271.fw /lib/firmware/htc_9271.fw fi -apt-get --assume-yes --force-yes install ${packages} +#================================================= +# INSTALL DEPENDENCIES +#================================================= +ynh_print_info "Installing dependencies..." -if [[ $? -ne 0 ]]; then - apt-get update - apt-get --assume-yes --force-yes install ${packages} -fi +ynh_install_app_dependencies "$pkg_dependencies" "$packages" #================================================= -# CHECK PARAMETERS +# NGINX CONFIGURATION #================================================= +ynh_print_info "Configuring nginx web server..." + +# Create a dedicated nginx config +ynh_add_nginx_config + +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_print_info "Configuring system user..." + +# Create a system user +ynh_system_user_create $app + +# Ensure the system user has enough sudo permissions +install -b -o root -g root -m 0440 ../conf/sudoers.conf /etc/sudoers.d/${app}_ynh +ynh_replace_string "__HOTSPOT_SYSUSER__" "${app}" /etc/sudoers.d/${app}_ynh + +#================================================= +# PHP-FPM CONFIGURATION +#================================================= +ynh_print_info "Configuring php-fpm..." + +# Create a dedicated php-fpm config +ynh_add_fpm_config + +#================================================= +# INSTALL CUSTOM SCRIPTS +#================================================= + +install -o root -g root -m 0755 ../conf/iw_multissid /usr/local/bin/ +install -o root -g root -m 0755 ../conf/iw_devices /usr/local/bin/ +install -o root -g root -m 0755 ../conf/iw_ssids /usr/local/bin/ +install -o root -g root -m 0755 ../conf/ipv6_expanded /usr/local/bin/ +install -o root -g root -m 0755 ../conf/ipv6_compressed /usr/local/bin/ if [[ ! -v ip6_net ]]; then # if ip6_net not set ip6_net=none ip6_addr=none if [[ -e /tmp/.ynh-vpnclient-started ]]; then - vpnclient_ip6_net=$(yunohost app setting vpnclient ip6_net 2>&1) - vpnclient_ip6_addr=$(yunohost app setting vpnclient ip6_addr 2>&1) + vpnclient_ip6_net=$(ynh_app_setting_get vpnclient ip6_net 2>&1) + vpnclient_ip6_addr=$(ynh_app_setting_get vpnclient ip6_addr 2>&1) if [[ $vpnclient_ip6_net =~ :: && $vpnclient_ip6_addr =~ :: ]]; then ip6_net=${vpnclient_ip6_net} @@ -172,20 +208,7 @@ if [[ ! -v ip6_net ]]; then # if ip6_net not set fi fi -wifi_device=$(sudo bash ../conf/iw_devices | awk -F\| '{ print $1 }') - -# Save arguments - -if [[ -z $wifi_device ]]; then - ynh_app_setting_set $app service_enabled 0 - wifi_device=none -else - ynh_app_setting_set $app service_enabled 1 -fi - -#================================================= -# SAVE SETTINGS -#================================================= +wifi_device=$(bash ../conf/iw_devices | awk -F\| '{ print $1 }') ynh_app_setting_set $app multissid 1 ynh_app_setting_set $app wifi_ssid "${wifi_ssid}" @@ -204,87 +227,67 @@ ynh_app_setting_set $app ip4_nat_prefix 10.0.242 ynh_app_setting_set $app vpnclient no ynh_app_setting_set $app service_name $service_name -#================================================= -# CREATE DEDICATED USER -#================================================= - -# Ensure the app has its own system user -if ! ynh_system_user_exists ${sysuser} -then - ynh_system_user_create ${sysuser} +if [[ -z $wifi_device ]]; then + ynh_app_setting_set $app service_enabled 0 + wifi_device=none +else + ynh_app_setting_set $app service_enabled 1 fi -# Ensure the system user has enough sudo permissions -install -b -o root -g root -m 0440 ../conf/sudoers.conf /etc/sudoers.d/${app}_ynh -ynh_replace_string "__HOTSPOT_SYSUSER__" "${sysuser}" /etc/sudoers.d/${app}_ynh - -#================================================= -# INSTALL CUSTOM SCRIPTS -#================================================= - -install -o root -g root -m 0755 ../conf/iw_multissid /usr/local/bin/ -install -o root -g root -m 0755 ../conf/iw_devices /usr/local/bin/ -install -o root -g root -m 0755 ../conf/iw_ssids /usr/local/bin/ -install -o root -g root -m 0755 ../conf/ipv6_expanded /usr/local/bin/ -install -o root -g root -m 0755 ../conf/ipv6_compressed /usr/local/bin/ - #================================================= # COPY CONFIGS #================================================= -mkdir -pm 0755 /var/log/nginx/ mkdir -pm 0755 /etc/dnsmasq.dhcpd/ chown root: /etc/dnsmasq.dhcpd/ install -b -o root -g root -m 0644 ../conf/hostapd.conf.tpl? /etc/hostapd/ install -b -o root -g root -m 0644 ../conf/dnsmasq_dhcpdv6.conf.tpl /etc/dnsmasq.dhcpd/dhcpdv6.conf.tpl install -b -o root -g root -m 0644 ../conf/dnsmasq_dhcpdv4.conf.tpl /etc/dnsmasq.dhcpd/dhcpdv4.conf.tpl -install -b -o root -g root -m 0644 ../conf/nginx_wifiadmin.conf "/etc/nginx/conf.d/${domain}.d/wifiadmin.conf" -install -b -o root -g root -m 0644 ../conf/phpfpm_wifiadmin.conf /etc/php5/fpm/pool.d/wifiadmin.conf + +# Copy init script +install -o root -g root -m 0755 ../conf/$service_name /usr/local/bin/ #================================================= # COPY WEB SOURCES #================================================= -mkdir -pm 0755 /var/www/wifiadmin/ -cp -a ../sources/* /var/www/wifiadmin/ +mkdir -pm 0755 ${final_path}/ +cp -a ../sources/* ${final_path}/ -chown -R root: /var/www/wifiadmin/ -chmod -R 0644 /var/www/wifiadmin/* -find /var/www/wifiadmin/ -type d -exec chmod +x {} \; +chown -R $app: ${final_path}/ +chmod -R 0644 ${final_path}/* +find ${final_path}/ -type d -exec chmod +x {} \; #================================================= # FIX CONFIGS #================================================= ## hostapd -sed 's|^DAEMON_CONF=$|&/etc/hostapd/hostapd.conf|' -i /etc/init.d/hostapd +ynh_replace_string "^DAEMON_CONF=$" "&/etc/hostapd/hostapd.conf" /etc/init.d/hostapd # We also need to put this in /etc/default/hostapd because on some setup # like RPi, the version of hostapd is different and /etc/init.d/hostapd # isnt used ... instead the service is "pure systemd" ... echo "DAEMON_CONF=/etc/hostapd/hostapd.conf" > /etc/default/hostapd -## nginx -sed "s||${path_url}|g" -i "/etc/nginx/conf.d/${domain}.d/wifiadmin.conf" -sed 's||/var/www/wifiadmin/|g' -i "/etc/nginx/conf.d/${domain}.d/wifiadmin.conf" -sed 's||wifiadmin|g' -i "/etc/nginx/conf.d/${domain}.d/wifiadmin.conf" - -## php-fpm -sed "s||wifiadmin|g" -i /etc/php5/fpm/pool.d/wifiadmin.conf -sed "s||${sysuser}|g" -i /etc/php5/fpm/pool.d/wifiadmin.conf -sed "s||${sysuser}|g" -i /etc/php5/fpm/pool.d/wifiadmin.conf -sed "s||/var/www/wifiadmin/|g" -i /etc/php5/fpm/pool.d/wifiadmin.conf - # Fix sources -sed "s||${path_url}|g" -i /var/www/wifiadmin/config.php +ynh_replace_string "__PATH__" "${path_url}" "$final_path/config.php" -# Copy init script -install -o root -g root -m 0755 ../conf/$service_name /usr/local/bin/ -install -o root -g root -m 0644 ../conf/$service_name.service /etc/systemd/system/ +#================================================= +# STORE THE CONFIG FILE CHECKSUM +#================================================= -# Update firewall for DHCP -yunohost firewall allow --no-upnp --ipv6 UDP 547 -yunohost firewall allow --no-upnp UDP 67 +# Calculate and store the config file checksum into the app settings +ynh_store_file_checksum "$final_path/config.php" +ynh_store_file_checksum "/etc/init.d/hostapd" + +#================================================= +# SETUP SYSTEMD +#================================================= +ynh_print_info "Configuring a systemd service..." + +# Create a dedicated systemd config +ynh_add_systemd_config $service_name # Set default inits # The boot order of these services are important, so they are disabled by default @@ -292,8 +295,13 @@ yunohost firewall allow --no-upnp UDP 67 systemctl disable hostapd systemctl stop hostapd systemctl unmask hostapd # On some system e.g. RPi, for some reason hostapd is masked after install ... -systemctl enable php5-fpm -systemctl restart php5-fpm + +#================================================= +# RELOAD NGINX AND PHP-FPM +#================================================= +ynh_print_info "Reloading nginx web server..." + +systemctl restart php7.0-fpm systemctl reload nginx # Remove IPv6 address set if there is a VPN installed @@ -304,7 +312,7 @@ if [[ $ip6_addr != none ]]; then fi # register the service -yunohost service add $service_name --description "creates a Wi-Fi access point" --need_lock +yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock # enable and start the service if device is present if [[ $wifi_device == none ]]; then @@ -314,5 +322,8 @@ else yunohost service start $service_name fi -# Reload SSOwat config -yunohost app ssowatconf +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info "Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 7eed1e9..bbc43b5 100644 --- a/scripts/remove +++ b/scripts/remove @@ -34,52 +34,124 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) firmware_nonfree=$(ynh_app_setting_get $app firmware_nonfree) +service_name=$(ynh_app_setting_get $app service_name) +final_path=$(ynh_app_setting_get $app final_path) + +#================================================= +# STANDARD REMOVE +#================================================= +# REMOVE SERVICE FROM ADMIN PANEL +#================================================= + +# Remove a service from the admin panel, added by `yunohost service add` +if yunohost service status $service_name >/dev/null 2>&1 +then + ynh_print_info "Removing $app service" + yunohost service stop $service_name + yunohost service remove $service_name +fi + +#================================================= +# STOP AND REMOVE SERVICE +#================================================= +ynh_print_info "Stopping and removing the systemd service" + +# Remove the dedicated systemd config +ynh_remove_systemd_config + +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_print_info "Removing dependencies" + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + +#================================================= +# REMOVE APP MAIN DIR +#================================================= +ynh_print_info "Removing app main directory" + +# Remove the app directory securely +ynh_secure_remove "$final_path" + +ynh_secure_remove /usr/local/bin/$service_name + +ynh_secure_remove "/usr/local/bin/iw_multissid" +ynh_secure_remove "/usr/local/bin/iw_devices" +ynh_secure_remove "/usr/local/bin/iw_ssids" +ynh_secure_remove "/usr/local/bin/ipv6_expanded" +ynh_secure_remove "/usr/local/bin/ipv6_compressed" + +ynh_secure_remove "/etc/sudoers.d/${app}_ynh" -# The End -yunohost service stop ynh-hotspot -yunohost service disable ynh-hotspot -yunohost service remove ynh-hotspot -ynh_secure_remove /etc/systemd/system/ynh-hotspot.service -ynh_secure_remove /usr/local/bin/ynh-hotspot for FILE in $(ls /tmp/.ynh-hotspot-* 2>/dev/null) do ynh_secure_remove "$FILE" done -# Update firewall for DHCP -yunohost firewall disallow --ipv6 UDP 547 -yunohost firewall disallow UDP 67 - # Remove confs -ynh_secure_remove /etc/dnsmasq.dhcpd -ynh_secure_remove /etc/nginx/conf.d/${domain}.d/wifiadmin.conf -ynh_secure_remove /etc/php5/fpm/pool.d/wifiadmin.conf +ynh_secure_remove "/etc/dnsmasq.dhcpd/dhcpdv6.conf.tpl" +ynh_secure_remove "/etc/dnsmasq.dhcpd/dhcpdv4.conf.tpl" for FILE in $(ls /etc/hostapd/hostapd.conf{.tpl?,} 2>/dev/null) do ynh_secure_remove "$FILE" done -ynh_secure_remove /etc/sudoers.d/hotspot_ynh # Remove packages -if [[ $firmware_nonfree == yes ]]; then - packages=$nonfree_packages -else - packages=$free_packages - +if [[ $firmware_nonfree -eq 0 ]]; then # Remove free firmwares if ! dpkg -l firmware-atheros &> /dev/null; then ynh_secure_remove /lib/firmware/htc_7010.fw ynh_secure_remove /lib/firmware/htc_9271.fw fi fi -apt-get --assume-yes --force-yes remove ${packages} -# Restart services -systemctl restart php5-fpm -systemctl reload nginx +#================================================= +# REMOVE NGINX CONFIGURATION +#================================================= +ynh_print_info "Removing nginx web server configuration" -# Remove sources -ynh_secure_remove /var/www/wifiadmin +# Remove the dedicated nginx config +ynh_remove_nginx_config -# Remove user -ynh_system_user_delete ${app} +#================================================= +# REMOVE PHP-FPM CONFIGURATION +#================================================= +ynh_print_info "Removing php-fpm configuration" + +# Remove the dedicated php-fpm config +ynh_remove_fpm_config + +#================================================= +# CLOSE A PORT +#================================================= + +if yunohost firewall list | grep -q "\- 547$" +then + ynh_print_info "Closing port 547" + ynh_exec_warn_less yunohost firewall disallow TCP 547 +fi + + +if yunohost firewall list | grep -q "\- 67$" +then + ynh_print_info "Closing port 67" + ynh_exec_warn_less yunohost firewall disallow TCP 67 +fi + +#================================================= +# GENERIC FINALIZATION +#================================================= +# REMOVE DEDICATED USER +#================================================= +ynh_print_info "Removing the dedicated system user" + +# Delete a system user +ynh_system_user_delete $app + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info "Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index dd29d1f..5a9c3d8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -17,14 +17,133 @@ source /usr/share/yunohost/helpers ynh_abort_if_errors #================================================= +# LOAD SETTINGS +#================================================= +ynh_print_info "Loading settings..." -gitcommit=$(sudo grep revision /etc/yunohost/apps/hotspot/status.json | sed 's/.*"revision": "\([^"]\+\)".*/\1/') -tmpdir=$(mktemp -dp /tmp/ hotspot-restore-XXXXX) +app=$YNH_APP_INSTANCE_NAME -git clone https://github.com/labriqueinternet/hotspot_ynh.git "${tmpdir}/" -git --work-tree "${tmpdir}/" --git-dir "${tmpdir}/.git/" reset --hard "${gitcommit}" +domain=$(ynh_app_setting_get $app domain) +path_url=$(ynh_app_setting_get $app path) +final_path=$(ynh_app_setting_get $app final_path) +firmware_nonfree=$(ynh_app_setting_get $app firmware_nonfree) +service_name=$(ynh_app_setting_get $app service_name) -cd "${tmpdir}/scripts/" -bash ./upgrade +#================================================= +# CHECK IF THE APP CAN BE RESTORED +#================================================= +ynh_print_info "Validating restoration parameters..." -ynh_secure_remove "${tmpdir}/" +ynh_webpath_available $domain $path_url \ + || ynh_die "Path not available: ${domain}${path_url}" +test ! -d $final_path \ + || ynh_die "There is already a directory: $final_path " + +#================================================= +# STANDARD RESTORATION STEPS +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= + +ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" + +#================================================= +# RESTORE THE APP MAIN DIR +#================================================= +ynh_print_info "Restoring the app main directory..." + +ynh_restore_file "$final_path" + +if [[ $firmware_nonfree -eq 1 ]]; then + # check if non-free is set on sources.list + if ! grep -q non-free /etc/apt/sources.list ; then + sed '/debian/{s/main/& non-free/}' -i /etc/apt/sources.list + fi + + packages=$nonfree_packages +else + packages=$free_packages + + ynh_restore_file "/lib/firmware/htc_7010.fw" + ynh_restore_file "/lib/firmware/htc_9271.fw" +fi + +ynh_restore_file "/etc/sudoers.d/${app}_ynh" + +ynh_restore_file "/usr/local/bin/iw_multissid" +ynh_restore_file "/usr/local/bin/iw_devices" +ynh_restore_file "/usr/local/bin/iw_ssids" +ynh_restore_file "/usr/local/bin/ipv6_expanded" +ynh_restore_file "/usr/local/bin/ipv6_compressed" + +for FILE in $(ls /etc/hostapd/hostapd.conf{.tpl?,} 2>/dev/null) +do + ynh_restore_file "$FILE" +done +ynh_restore_file "/etc/dnsmasq.dhcpd/dhcpdv6.conf.tpl" +ynh_restore_file "/etc/dnsmasq.dhcpd/dhcpdv4.conf.tpl" + +ynh_restore_file "/usr/local/bin/$service_name" + +ynh_restore_file "/etc/init.d/hostapd" + +#================================================= +# RECREATE THE DEDICATED USER +#================================================= +ynh_print_info "Recreating the dedicated system user..." + +# Create the dedicated user (if not existing) +ynh_system_user_create $app + +#================================================= +# RESTORE USER RIGHTS +#================================================= + +# Restore permissions on app files +chown -R $app: $final_path + +#================================================= +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= + +ynh_restore_file "/etc/php/7.0/fpm/pool.d/$app.conf" + +#================================================= +# SPECIFIC RESTORATION +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_print_info "Reinstalling dependencies..." + +# Define and install dependencies +ynh_install_app_dependencies "$pkg_dependencies" "$packages" + +#================================================= +# RESTORE SYSTEMD +#================================================= +ynh_print_info "Restoring the systemd configuration..." + +ynh_restore_file "/etc/systemd/system/$service_name.service" +systemctl enable $service_name.service + +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= + +yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock + +#================================================= +# GENERIC FINALIZATION +#================================================= +# RELOAD NGINX AND PHP-FPM +#================================================= +ynh_print_info "Reloading nginx web server and php-fpm..." + +systemctl restart php7.0-fpm +systemctl reload nginx + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info "Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index b4be8dc..16ec71e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,7 +1,7 @@ #!/bin/bash #================================================= -# GENERIC STARTING +# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -9,26 +9,63 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - #================================================= # LOAD SETTINGS #================================================= +ynh_print_info "Loading installation settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) path_url=$(ynh_app_setting_get $app path) -wifi_ssid=$(ynh_app_setting_get $app wifi_ssid) -wifi_passphrase=$(ynh_app_setting_get $app wifi_passphrase) -firmware_nonfree=$(ynh_app_setting_get $app firmware_nonfree) final_path=$(ynh_app_setting_get $app final_path) -multissid=$(ynh_app_setting_get $app multissid) +firmware_nonfree=$(ynh_app_setting_get $app firmware_nonfree) +service_name=$(ynh_app_setting_get $app service_name) + +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_print_info "Ensuring downward compatibility..." + +# If final_path doesn't exist, create it +if [ -z $final_path ]; then + final_path=/var/www/$app + ynh_app_setting_set $app final_path $final_path +fi + +if [ -d /var/www/wifiadmin/ ]; then + mv /var/www/wifiadmin $final_path + mv /etc/php/7.0/fpm/pool.d/wifiadmin.conf /etc/php/7.0/fpm/pool.d/$app.conf + ynh_replace_string "wifiadmin" "$app" /etc/php/7.0/fpm/pool.d/$app.conf + systemctl reload php7.0-fpm +fi + +if [ $firmware_nonfree = "yes" ]; then + firmware_nonfree=1 + ynh_app_setting_set $app firmware_nonfree $firmware_nonfree +elif [ $firmware_nonfree = "no" ]; then + firmware_nonfree=0 + ynh_app_setting_set $app firmware_nonfree $firmware_nonfree +fi + +if [ -z $service_name ]; then + service_name="ynh-hotspot" + ynh_app_setting_set $app service_name $service_name +fi + +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_print_info "Backing up the app before upgrading (may take a while)..." + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # 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 THE PATH @@ -38,21 +75,97 @@ multissid=$(ynh_app_setting_get $app multissid) path_url=$(ynh_normalize_url_path $path_url) #================================================= -# SPECIFIC UPGRADE +# STANDARD UPGRADE STEPS #================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= +ynh_print_info "Upgrading source files..." -source ./prerequisites +# Download, check integrity, uncompress and patch the source from app.src +cp -a ../sources/* ${final_path}/ -# Changes +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_print_info "Upgrading nginx web server configuration..." -if [[ -z $(ynh_app_setting_get $app ip6_firewall) ]]; then - ip6_firewall=$(printf '1|%.0s' $(seq "${multissid}")) - ip6_firewall=$(echo "${ip6_firewall%?}") +# Create a dedicated nginx config +ynh_add_nginx_config - ynh_app_setting_set "${app}" ip6_firewall "${ip6_firewall}" +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_print_info "Upgrading dependencies..." + +if [[ $firmware_nonfree -eq 1 ]]; then + packages=$nonfree_packages +else + packages=$free_packages fi +ynh_install_app_dependencies "$pkg_dependencies" "$packages" + +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_print_info "Making sure dedicated system user exists..." + +# Create a dedicated user (if not existing) +ynh_system_user_create $app + +#================================================= +# PHP-FPM CONFIGURATION +#================================================= +ynh_print_info "Upgrading php-fpm configuration..." + +# Create a dedicated php-fpm config +ynh_add_fpm_config + +#================================================= +# SPECIFIC UPGRADE +#================================================= +# FIX CONFIGS +#================================================= + +### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it. +ynh_backup_if_checksum_is_different "$final_path/config.php" +ynh_replace_string "__PATH__" "${path_url}" "$final_path/config.php" +# Recalculate and store the checksum of the file for the next upgrade. +ynh_store_file_checksum "$final_path/config.php" + +#================================================= +# SETUP SYSTEMD +#================================================= +ynh_print_info "Upgrading systemd configuration..." + +# Create a dedicated systemd config +ynh_add_systemd_config $service_name + # Make sure that the yunohost service has a description and need-lock enabled -yunohost service remove ynh-hotspot -yunohost service add ynh-hotspot --description "creates a Wi-Fi access point" --need_lock -yunohost service start ynh-hotspot +yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock +yunohost service start $service_name + +#================================================= +# GENERIC FINALIZATION +#================================================= +# SECURE FILES AND DIRECTORIES +#================================================= + +# Set permissions on app files +chown -R $app: ${final_path}/ +chmod -R 0644 ${final_path}/* +find ${final_path}/ -type d -exec chmod +x {} \; + +#================================================= +# RELOAD NGINX +#================================================= +ynh_print_info "Reloading nginx web server..." + +systemctl restart php7.0-fpm +systemctl reload nginx + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info "Upgrade of $app completed" diff --git a/sources/config.php b/sources/config.php index 6546292..9858e14 100644 --- a/sources/config.php +++ b/sources/config.php @@ -22,11 +22,11 @@ function configure() { option('env', ENV_PRODUCTION); option('debug', false); - option('base_uri', '/'); + option('base_uri', '__PATH__/'); layout('layout.html.php'); - define('PUBLIC_DIR', '/public'); + define('PUBLIC_DIR', '__PATH__/public'); } // Before routing