From eb902efa8c74f72e3ba875d8b5261f532e151f16 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 13 Oct 2021 01:22:32 +0200 Subject: [PATCH] Cleanup legacy stuff --- conf/config.php.tpl | 73 -------- conf/ipv6_compressed | 20 -- conf/ipv6_expanded | 20 -- conf/iw_devices | 20 -- conf/iw_multissid | 27 --- conf/iw_ssids | 20 -- conf/nginx.conf | 49 ----- conf/php-fpm.conf | 430 ------------------------------------------- conf/sudoers.conf | 12 -- manifest.json | 12 +- scripts/_common.sh | 7 +- scripts/backup | 8 - scripts/install | 59 +----- scripts/remove | 38 ---- scripts/restore | 10 +- scripts/upgrade | 36 ++-- 16 files changed, 46 insertions(+), 795 deletions(-) delete mode 100644 conf/config.php.tpl delete mode 100644 conf/ipv6_compressed delete mode 100644 conf/ipv6_expanded delete mode 100644 conf/iw_devices delete mode 100644 conf/iw_multissid delete mode 100644 conf/iw_ssids delete mode 100644 conf/nginx.conf delete mode 100644 conf/php-fpm.conf delete mode 100644 conf/sudoers.conf diff --git a/conf/config.php.tpl b/conf/config.php.tpl deleted file mode 100644 index 4609410..0000000 --- a/conf/config.php.tpl +++ /dev/null @@ -1,73 +0,0 @@ - - * 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 . - */ - -// Framework configuration -function configure() { - option('env', ENV_PRODUCTION); - option('debug', false); - option('base_uri', '__PATH__/'); - - layout('layout.html.php'); - - define('PUBLIC_DIR', '__PATH__/public'); -} - -// Before routing -function before($route) { - $lang_mapping = array( - 'fr' => 'fr_FR' - ); - - if(!isset($_SESSION['locale'])) { - $locale = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']); - $_SESSION['locale'] = strtolower(substr(chop($locale[0]), 0, 2)); - } - - $lang = $_SESSION['locale']; - - // Convert simple language code into full language code - if(array_key_exists($lang, $lang_mapping)) { - $lang = $lang_mapping[$lang]; - } - - $lang = "$lang.utf8"; - $textdomain = "localization"; - - putenv("LANGUAGE=$lang"); - putenv("LANG=$lang"); - putenv("LC_ALL=$lang"); - putenv("LC_MESSAGES=$lang"); - - setlocale(LC_ALL, $lang); - setlocale(LC_CTYPE, $lang); - - $locales_dir = '__FINAL_PATH__/i18n'; - - bindtextdomain($textdomain, $locales_dir); - bind_textdomain_codeset($textdomain, 'UTF-8'); - textdomain($textdomain); - - set('locale', $lang); -} - -// After routing -function after($output, $route) { - return $output; -} diff --git a/conf/ipv6_compressed b/conf/ipv6_compressed deleted file mode 100644 index 6311641..0000000 --- a/conf/ipv6_compressed +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# 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 . - -sipcalc "${1}" | grep Compressed | awk '{ print $NF; }' diff --git a/conf/ipv6_expanded b/conf/ipv6_expanded deleted file mode 100644 index cf69521..0000000 --- a/conf/ipv6_expanded +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# 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 . - -sipcalc "${1}" | grep Expanded | awk '{ print $NF; }' diff --git a/conf/iw_devices b/conf/iw_devices deleted file mode 100644 index 1f4dff6..0000000 --- a/conf/iw_devices +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# 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 . - -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 deleted file mode 100644 index 66ab148..0000000 --- a/conf/iw_multissid +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# 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 . - -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 -else - echo $multissid -fi diff --git a/conf/iw_ssids b/conf/iw_ssids deleted file mode 100644 index f4c8d1e..0000000 --- a/conf/iw_ssids +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# 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 . - -echo -n hotspot0 $(/sbin/iw dev | grep Interface | grep hotspot | awk '{ print $NF }') | tr ' ' \| diff --git a/conf/nginx.conf b/conf/nginx.conf deleted file mode 100644 index 2155190..0000000 --- a/conf/nginx.conf +++ /dev/null @@ -1,49 +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 . - -#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; - } - - index index.php; - - # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - client_max_body_size 10G; - - try_files $uri $uri/ index.php; - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; - - fastcgi_index index.php; - include fastcgi_params; - fastcgi_read_timeout 600; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - 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 deleted file mode 100644 index 3183b08..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_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/sudoers.conf b/conf/sudoers.conf deleted file mode 100644 index fd5f84a..0000000 --- a/conf/sudoers.conf +++ /dev/null @@ -1,12 +0,0 @@ -Cmnd_Alias HOTSPOT_YUNOHOST = /usr/bin/yunohost app info hotspot *,\ - /usr/bin/yunohost app setting hotspot *,\ - /usr/bin/yunohost app setting vpnclient * - -Cmnd_Alias HOTSPOT_SERVICE = /bin/systemctl stop ynh-hotspot,\ - /bin/systemctl start ynh-hotspot - -Cmnd_Alias HOTSPOT_MISC = /usr/local/bin/ynh-hotspot *,\ - /usr/local/bin/iw_devices *,\ - /usr/local/bin/iw_multissid * - -__HOTSPOT_SYSUSER__ ALL = NOPASSWD: /bin/grep, HOTSPOT_YUNOHOST, HOTSPOT_SERVICE, HOTSPOT_MISC diff --git a/manifest.json b/manifest.json index ff41d88..c7dd48e 100644 --- a/manifest.json +++ b/manifest.json @@ -37,18 +37,16 @@ "ask": { "en": "Choose a wifi password (at least 8 characters for WPA2)", "fr": "Choisissez un mot de passe wifi (au minimum 8 caractères pour le WPA2)" - }, - "example": "VhegT8oev0jZI" + } }, { "name": "firmware_nonfree", - "type": "string", + "type": "boolean", "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)" + "en": "Install non-free firmwares - in addition to the free ones - for the wifi dongle", + "fr": "Installer des firmwares non-libres (en plus des libres) pour la clé USB wifi" }, - "choice": [ "yes", "no" ], - "default": "no" + "default": false } ] } diff --git a/scripts/_common.sh b/scripts/_common.sh index 2d8cdfc..0687a14 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -pkg_dependencies="sipcalc hostapd iptables iw dnsmasq kmod" +pkg_dependencies="sipcalc hostapd iw kmod" nonfree_firmware_packages="firmware-atheros firmware-realtek firmware-ralink firmware-libertas atmel-firmware firmware-zd1211" free_firmware_packages="firmware-ath9k-htc" @@ -12,6 +12,11 @@ free_firmware_packages="firmware-ath9k-htc" # PERSONAL HELPERS #================================================= +function iw_devices() +{ + echo -n $(/sbin/iw dev | grep Interface | grep -v 'mon\.' | grep -v hotspot | awk '{ print $NF }') | tr ' ' '|' +} + function check_armbian_nonfree_conflict() { diff --git a/scripts/backup b/scripts/backup index 0d51f88..eb44588 100644 --- a/scripts/backup +++ b/scripts/backup @@ -40,14 +40,6 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="/etc/sudoers.d/${app}_ynh" - -ynh_backup --src_path="/usr/local/bin/iw_multissid" -ynh_backup --src_path="/usr/local/bin/iw_devices" -ynh_backup --src_path="/usr/local/bin/iw_ssids" -ynh_backup --src_path="/usr/local/bin/ipv6_expanded" -ynh_backup --src_path="/usr/local/bin/ipv6_compressed" - for FILE in $(ls /etc/hostapd/hostapd.conf{.tpl?,} 2>/dev/null) do ynh_backup --src_path="$FILE" diff --git a/scripts/install b/scripts/install index 50d4ae0..8c63ba1 100644 --- a/scripts/install +++ b/scripts/install @@ -1,22 +1,5 @@ #!/bin/bash -# 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 . - #================================================= # GENERIC START #================================================= @@ -54,20 +37,14 @@ service_name='ynh-hotspot' #================================================= ynh_script_progression --message="Validating installation 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 +if [[ -z $wifi_ssid ]] || [[ -z $wifi_passphrase ]]; then ynh_die --message="Your Wifi Hotspot needs a name and a password" fi # Check passphrase length -wifi_passphrase_length="$(echo -n "${wifi_passphrase}" | wc -c)" -if [[ $wifi_passphrase_length -lt 8 || $wifi_passphrase_length -gt 63 ]]; then +wifi_passphrase_length="$(wc -c <<< "${wifi_passphrase}")" +if [[ $wifi_passphrase_length -lt 8 ]] || [[ $wifi_passphrase_length -gt 63 ]]; then ynh_die --message="Your password must from 8 to 63 characters (WPA2 passphrase)" fi @@ -81,7 +58,6 @@ fi #================================================= ynh_script_progression --message="Storing installation settings..." -ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=wifi_ssid --value="$wifi_ssid" ynh_app_setting_set --app=$app --key=wifi_passphrase --value="$wifi_passphrase" ynh_app_setting_set --app=$app --key=firmware_nonfree --value="$firmware_nonfree" @@ -129,20 +105,10 @@ ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create --username=$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 --match_string="__HOTSPOT_SYSUSER__" --replace_string="${app}" --target_file="/etc/sudoers.d/${app}_ynh" - #================================================= -# INSTALL CUSTOM SCRIPTS +# SPECIFIC SETTINGS #================================================= -ynh_script_progression --message="Installing custom script..." - -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/ +ynh_script_progression --message="Configuring hotspot..." if [[ ! -v ip6_net ]]; then # if ip6_net not set ip6_net=none @@ -160,7 +126,7 @@ if [[ ! -v ip6_net ]]; then # if ip6_net not set fi hot_reload_usb_wifi_cards -wifi_device=$(bash ../conf/iw_devices | awk -F\| '{ print $1 }') +wifi_device=$(iw_devices | awk -F\| '{ print $1 }') ynh_app_setting_set --app=$app --key=multissid --value=1 ynh_app_setting_set --app=$app --key=ssid_nb --value=1 @@ -185,7 +151,7 @@ fi #================================================= # COPY CONFIGS #================================================= -ynh_script_progression --message="Copying configuration..." +ynh_script_progression --message="Copying configuration files..." mkdir -pm 0755 /etc/dnsmasq.dhcpd/ chown root: /etc/dnsmasq.dhcpd/ @@ -204,6 +170,8 @@ ynh_script_progression --message="Configuring hostapd..." ## hostapd ynh_replace_string --match_string="^DAEMON_CONF=$" --replace_string="&/etc/hostapd/hostapd.conf" --target_file=/etc/init.d/hostapd +ynh_store_file_checksum --file="/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" ... @@ -216,14 +184,6 @@ systemctl disable hostapd --quiet systemctl stop hostapd systemctl unmask hostapd # On some system e.g. RPi, for some reason hostapd is masked after install ... -#================================================= -# STORE THE CONFIG FILE CHECKSUM -#================================================= -ynh_script_progression --message="Storing the config file checksum..." - -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="/etc/init.d/hostapd" - #================================================= # SETUP SYSTEMD #================================================= @@ -233,6 +193,7 @@ ynh_script_progression --message="Configuring a systemd service..." ynh_add_systemd_config --service=$service_name # Remove IPv6 address set if there is a VPN installed +# ... but why ? ... if [[ $ip6_addr != "" ]]; then if ip -6 address show dev tun0 2> /dev/null | grep -q "${ip6_addr}/"; then ip address delete "${ip6_addr}/128" dev tun0 &> /dev/null diff --git a/scripts/remove b/scripts/remove index f76d102..2238e07 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,22 +1,5 @@ #!/bin/bash -# 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 . - #================================================= # GENERIC START #================================================= @@ -74,14 +57,6 @@ ynh_script_progression --message="Removing app main directory..." # Remove the app directory securely ynh_secure_remove --file="/usr/local/bin/$service_name" -ynh_secure_remove --file="/usr/local/bin/iw_multissid" -ynh_secure_remove --file="/usr/local/bin/iw_devices" -ynh_secure_remove --file="/usr/local/bin/iw_ssids" -ynh_secure_remove --file="/usr/local/bin/ipv6_expanded" -ynh_secure_remove --file="/usr/local/bin/ipv6_compressed" - -ynh_secure_remove --file="/etc/sudoers.d/${app}_ynh" - for FILE in $(ls /tmp/.ynh-hotspot-* 2>/dev/null) do ynh_secure_remove --file="$FILE" @@ -112,19 +87,6 @@ then ynh_exec_warn_less yunohost firewall disallow TCP 67 fi -#================================================= -# REMOVE LEGACY INTERFACES -#================================================= -if [ -d /etc/nginx/conf.d/*.d/$app.conf ]; then - ynh_secure_remove /etc/nginx/conf.d/*.d/$app.conf -fi -if [ -d /etc/php/*/fpm/pool.d/$app.conf ]; then - ynh_secure_remove /etc/php/*/fpm/pool.d/$app.conf -fi -if [ -d /var/www/$app ]; then - ynh_secure_remove /var/www/$app -fi - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index f85d939..5a454ab 100644 --- a/scripts/restore +++ b/scripts/restore @@ -55,14 +55,6 @@ else pkg_dependencies="$pkg_dependencies $free_firmware_packages" fi -ynh_restore_file --origin_path="/etc/sudoers.d/${app}_ynh" - -ynh_restore_file --origin_path="/usr/local/bin/iw_multissid" -ynh_restore_file --origin_path="/usr/local/bin/iw_devices" -ynh_restore_file --origin_path="/usr/local/bin/iw_ssids" -ynh_restore_file --origin_path="/usr/local/bin/ipv6_expanded" -ynh_restore_file --origin_path="/usr/local/bin/ipv6_compressed" - for FILE in $(ls /etc/hostapd/hostapd.conf{.tpl?,} 2>/dev/null) do ynh_restore_file --origin_path="$FILE" @@ -105,7 +97,7 @@ yunohost service add $service_name --description "Creates a Wi-Fi access point" ynh_script_progression --message="Starting a systemd service..." hot_reload_usb_wifi_cards -wifi_device=$(bash ../settings/conf/iw_devices | awk -F\| '{ print $1 }') +wifi_device=$(iw_devices | awk -F\| '{ print $1 }') if [[ -z $wifi_device ]]; then ynh_app_setting_set --app=$app --key=service_enabled --value=0 diff --git a/scripts/upgrade b/scripts/upgrade index 4dee019..f2e5dc0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -54,16 +54,6 @@ ynh_systemd_action --service_name=$service_name --action="stop" --log_path=syste #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -if [ -d /etc/nginx/conf.d/*.d/$app.conf ]; then - ynh_secure_remove /etc/nginx/conf.d/*.d/$app.conf -fi -if [ -d /etc/php/*/fpm/pool.d/$app.conf ]; then - ynh_secure_remove /etc/php/*/fpm/pool.d/$app.conf -fi -if [ -d /var/www/$app ]; then - ynh_secure_remove /var/www/$app -fi - if [ -d /var/www/wifiadmin/ ]; then ynh_secure_remove /var/www/wifiadmin/ fi @@ -81,6 +71,29 @@ if [ -z $service_name ]; then ynh_app_setting_set --app=$app --key=service_name --value=$service_name fi +# Old stuff prior to 2.x + +if [ -f /etc/nginx/conf.d/*.d/$app.conf ]; then + ynh_secure_remove /etc/nginx/conf.d/*.d/$app.conf + ynh_systemd_action --service_name=nginx --action=reload +fi +if [ -f /etc/php/*/fpm/pool.d/$app.conf ]; then + ynh_secure_remove /etc/php/*/fpm/pool.d/$app.conf + ynh_systemd_action --service_name=php$YNH_DEFAULT_PHP_VERSION-fpm --action=reload +fi + +if [ -d /var/www/$app ]; then + ynh_secure_remove /var/www/$app +fi + +[ -z "$(ynh_app_setting_get $app domain)" ] || ynh_app_setting_delete $app domain +[ -z "$(ynh_app_setting_get $app path)" ] || ynh_app_setting_delete $app path +[ -z "$(ynh_app_setting_get $app final_path)" ] || ynh_app_setting_delete $app final_path + +if [ -e "/etc/sudoers.d/${app}_ynh" ]; then + ynh_secure_remove "/etc/sudoers.d/${app}_ynh" +fi + #================================================= # CREATE DEDICATED USER #================================================= @@ -119,7 +132,6 @@ install -b -o root -g root -m 0644 ../conf/dnsmasq_dhcpdv4.conf.tpl /etc/dnsmasq # Copy init script install -o root -g root -m 0755 ../conf/$service_name /usr/local/bin/ -ynh_replace_string --match_string="__PHPVERSION__" --replace_string="${phpversion}" --target_file="/usr/local/bin/$service_name" #================================================= # SETUP SYSTEMD @@ -144,7 +156,7 @@ yunohost service add $service_name --description "Creates a Wi-Fi access point" ynh_script_progression --message="Starting a systemd service..." hot_reload_usb_wifi_cards -wifi_device=$(bash ../conf/iw_devices | awk -F\| '{ print $1 }') +wifi_device=$(iw_devices | awk -F\| '{ print $1 }') if [[ -z $wifi_device ]]; then ynh_app_setting_set --app=$app --key=service_enabled --value=0