From 690c7aa1e1e06143d863f8f06d359cb5118c058e Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 20 Feb 2019 19:43:50 +0100 Subject: [PATCH 01/42] firmware_nonfree is now a boolean --- check_process | 4 ++-- manifest.json | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/check_process b/check_process index 992e0b1..e4d73ff 100644 --- a/check_process +++ b/check_process @@ -5,7 +5,7 @@ path="/path" (PATH) wifi_ssid="myNeutralNetwork" wifi_passphrase="VhegT8oev0jZI" (PASSWORD) - firmware_nonfree="no" + firmware_nonfree=0 ; Checks pkg_linter=1 setup_sub_dir=1 @@ -33,4 +33,4 @@ Level 7=auto Level 8=0 Level 9=0 - Level 10=0 + Level 10=0 diff --git a/manifest.json b/manifest.json index 768e335..3d84e2e 100644 --- a/manifest.json +++ b/manifest.json @@ -64,14 +64,12 @@ }, { "name": "firmware_nonfree", - "type": "string", - "choice": ["yes", "no"], + "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)" }, - "example": "yes", - "default": "yes" + "default": true } ] } From 4637e28176371d0ea4e318cead17e0c07b76c129 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 20 Feb 2019 19:46:07 +0100 Subject: [PATCH 02/42] install: $packages has dependencies --- scripts/install | 63 +++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/scripts/install b/scripts/install index 9deeb7b..b0f422c 100644 --- a/scripts/install +++ b/scripts/install @@ -78,11 +78,39 @@ ynh_app_setting_set "$app" firmware_nonfree "$firmware_nonfree" #================================================= # STANDARD MODIFICATIONS +#================================================= +# INSTALL NONFREE FIRWARE IF REQUESTED +#================================================= + +export DEBIAN_FRONTEND=noninteractive + +# Packaged USB Wireless Device firmwares +# Based on https://wiki.debian.org/WiFi#USB_Devices +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 + + # Extract from http://packages.trisquel.info/toutatis-updates/open-ath9k-htc-firmware + # https://www.fsf.org/news/ryf-certification-thinkpenguin-usb-with-atheros-chip + # https://wiki.debian.org/ath9k_htc/open_firmware + mkdir -p /lib/firmware + install -b -o root -g root -m 0644 ../conf/firmware_htc-7010.fw /lib/firmware/htc_7010.fw + install -b -o root -g root -m 0644 ../conf/firmware_htc-9271.fw /lib/firmware/htc_9271.fw +fi + +ynh_package_update + #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_install_app_dependencies "$pkg_dependencies" +ynh_install_app_dependencies "$pkg_dependencies" "$packages" #================================================= # SPECIFIC SETUP @@ -112,39 +140,6 @@ if [[ $wifi_passphrase =~ [^[:print:]] ]]; then ynh_die "Only printable ASCII characters are permitted in your password (WPA2 passphrase)" fi -#================================================= -# INSTALL NONFREE FIRWARE IF REQUESTED -#================================================= - -export DEBIAN_FRONTEND=noninteractive - -# Packaged USB Wireless Device firmwares -# Based on https://wiki.debian.org/WiFi#USB_Devices -if [[ $firmware_nonfree == yes ]]; 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 - - # Extract from http://packages.trisquel.info/toutatis-updates/open-ath9k-htc-firmware - # https://www.fsf.org/news/ryf-certification-thinkpenguin-usb-with-atheros-chip - # https://wiki.debian.org/ath9k_htc/open_firmware - mkdir -p /lib/firmware - install -b -o root -g root -m 0644 ../conf/firmware_htc-7010.fw /lib/firmware/htc_7010.fw - 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} - -if [[ $? -ne 0 ]]; then - apt-get update - apt-get --assume-yes --force-yes install ${packages} -fi - #================================================= # CHECK PARAMETERS #================================================= From d90f5ff323a1cbf9ff53314603c3e02633b860b8 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 20 Feb 2019 19:46:27 +0100 Subject: [PATCH 03/42] install: using ynh_add_systemd_config --- scripts/install | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index b0f422c..197d14a 100644 --- a/scripts/install +++ b/scripts/install @@ -263,7 +263,13 @@ sed "s||${path_url}|g" -i /var/www/wifiadmin/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/ + +#================================================= +# SETUP SYSTEMD +#================================================= + +# Create a dedicated systemd config +ynh_add_systemd_config $service_name # Update firewall for DHCP yunohost firewall allow --no-upnp --ipv6 UDP 547 @@ -276,6 +282,11 @@ systemctl disable hostapd systemctl stop hostapd systemctl enable php5-fpm systemctl restart php5-fpm + +#================================================= +# RELOAD NGINX +#================================================= + systemctl reload nginx # Remove IPv6 address set if there is a VPN installed From 86e543231afda42c6b626dcd6b5985d5a7a5ad01 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 20 Feb 2019 19:47:32 +0100 Subject: [PATCH 04/42] remove: using ynh_remove_systemd_config --- scripts/remove | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/scripts/remove b/scripts/remove index a57cde7..3634cf1 100644 --- a/scripts/remove +++ b/scripts/remove @@ -34,13 +34,28 @@ 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) + +#================================================= +# REMOVE SERVICE FROM ADMIN PANEL +#================================================= + +# Remove a service from the admin panel, added by `yunohost service add` +if yunohost service status | grep -q $app +then + echo "Remove $app service" + yunohost service remove $app +fi + +#================================================= +# STOP AND REMOVE SERVICE +#================================================= + +# Remove the dedicated systemd config +ynh_remove_systemd_config $service_name + +ynh_secure_remove /usr/local/bin/$service_name -# The End -systemctl stop ynh-hotspot -systemctl 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" From baa678b6d54cfe2de4cfdcaa5f565676a8d53740 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 20 Feb 2019 19:48:18 +0100 Subject: [PATCH 05/42] remove: using ynh_remove_app_dependencies --- scripts/remove | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/remove b/scripts/remove index 3634cf1..dcddddd 100644 --- a/scripts/remove +++ b/scripts/remove @@ -76,18 +76,15 @@ 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} + +ynh_remove_app_dependencies # Restart services systemctl restart php5-fpm From 6ed5b79d45edaf81f411695692ac837583647d47 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 00:46:33 +0100 Subject: [PATCH 06/42] Complete refactor of the install script --- check_process | 14 +- conf/{nginx_wifiadmin.conf => nginx.conf} | 15 +- conf/php-fpm.conf | 431 ++++++++++++++++++++++ conf/phpfpm_wifiadmin.conf | 202 ---------- conf/ynh-hotspot | 4 +- manifest.json | 6 +- scripts/install | 224 ++++++----- sources/config.php | 4 +- 8 files changed, 562 insertions(+), 338 deletions(-) rename conf/{nginx_wifiadmin.conf => nginx.conf} (80%) create mode 100644 conf/php-fpm.conf delete mode 100644 conf/phpfpm_wifiadmin.conf diff --git a/check_process b/check_process index e4d73ff..b4206d2 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_public=0 + setup_private=1 + setup_public=1 upgrade=1 + upgrade=1 from_commit=CommitHash 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=1 ;;; Levels Level 1=auto Level 2=auto @@ -33,4 +29,4 @@ Level 7=auto Level 8=0 Level 9=0 - Level 10=0 + Level 10=0 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 b/conf/ynh-hotspot index f6c6283..06ca730 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 3d84e2e..c22caff 100644 --- a/manifest.json +++ b/manifest.json @@ -15,12 +15,12 @@ "url": "http://julien.vaubourg.com" }, "requirements": { - "yunohost": ">= 2.2.0", - "moulinette": ">= 2.4.0" + "yunohost": ">= 3.4" }, "multi_instance": false, "services": [ - "php5-fpm" + "nginx", + "php7.0-fpm" ], "arguments": { "install" : [ diff --git a/scripts/install b/scripts/install index 197d14a..66a3662 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,22 +52,61 @@ 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 + +# Check arguments +if [[ -z $wifi_ssid || -z $wifi_passphrase ]]; then + ynh_die "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 + ynh_die "Your password must from 8 to 63 characters (WPA2 passphrase)" +fi + +# Check no special characters are present in the passphrase +if [[ $wifi_passphrase =~ [^[:print:]] ]]; then + ynh_die "Only printable ASCII characters are permitted in your password (WPA2 passphrase)" +fi + +#================================================= +# RUN PREREQUISITES +#================================================= + +source ./prerequisites + +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) + + if [[ $vpnclient_ip6_net =~ :: && $vpnclient_ip6_addr =~ :: ]]; then + ip6_net=${vpnclient_ip6_net} + ip6_addr=${vpnclient_ip6_addr} + fi + fi +fi + +wifi_device=$(sudo bash ../conf/iw_devices | awk -F\| '{ print $1 }') #================================================= # 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" @@ -76,8 +114,41 @@ 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" +ynh_app_setting_set $app multissid 1 +ynh_app_setting_set $app wifi_ssid "${wifi_ssid}" +ynh_app_setting_set $app wifi_secure 1 +ynh_app_setting_set $app wifi_passphrase "${wifi_passphrase}" +ynh_app_setting_set $app wifi_device "${wifi_device}" +ynh_app_setting_set $app wifi_channel 6 +ynh_app_setting_set $app ip6_addr "${ip6_addr}" +ynh_app_setting_set $app ip6_firewall 1 +ynh_app_setting_set $app ip6_net "${ip6_net}" +ynh_app_setting_set $app ip6_dns0 2001:913::8 +ynh_app_setting_set $app ip6_dns1 2001:910:800::12 +ynh_app_setting_set $app ip4_dns0 80.67.188.188 +ynh_app_setting_set $app ip4_dns1 80.67.169.12 +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 + +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 + #================================================= # 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 #================================================= @@ -109,101 +180,37 @@ ynh_package_update #================================================= # INSTALL DEPENDENCIES #================================================= +ynh_print_info "Installing dependencies..." ynh_install_app_dependencies "$pkg_dependencies" "$packages" #================================================= -# SPECIFIC SETUP -#================================================= -# RUN PREREQUISITES +# NGINX CONFIGURATION #================================================= +ynh_print_info "Configuring nginx web server..." -source ./prerequisites - -#================================================= -# CHECK PARAMETERS -#================================================= - -# Check arguments -if [[ -z $wifi_ssid || -z $wifi_passphrase ]]; then - ynh_die "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 - ynh_die "Your password must from 8 to 63 characters (WPA2 passphrase)" -fi - -# Check no special characters are present in the passphrase -if [[ $wifi_passphrase =~ [^[:print:]] ]]; then - ynh_die "Only printable ASCII characters are permitted in your password (WPA2 passphrase)" -fi - -#================================================= -# CHECK PARAMETERS -#================================================= - -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) - - if [[ $vpnclient_ip6_net =~ :: && $vpnclient_ip6_addr =~ :: ]]; then - ip6_net=${vpnclient_ip6_net} - ip6_addr=${vpnclient_ip6_addr} - fi - 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 -#================================================= - -ynh_app_setting_set $app multissid 1 -ynh_app_setting_set $app wifi_ssid "${wifi_ssid}" -ynh_app_setting_set $app wifi_secure 1 -ynh_app_setting_set $app wifi_passphrase "${wifi_passphrase}" -ynh_app_setting_set $app wifi_device "${wifi_device}" -ynh_app_setting_set $app wifi_channel 6 -ynh_app_setting_set $app ip6_addr "${ip6_addr}" -ynh_app_setting_set $app ip6_firewall 1 -ynh_app_setting_set $app ip6_net "${ip6_net}" -ynh_app_setting_set $app ip6_dns0 2001:913::8 -ynh_app_setting_set $app ip6_dns1 2001:910:800::12 -ynh_app_setting_set $app ip4_dns0 80.67.188.188 -ynh_app_setting_set $app ip4_dns1 80.67.169.12 -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 a dedicated nginx config +ynh_add_nginx_config #================================================= # CREATE DEDICATED USER #================================================= +ynh_print_info "Configuring system user..." -# Ensure the app has its own system user -if ! ynh_system_user_exists ${sysuser} -then - ynh_system_user_create ${sysuser} -fi +# 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__" "${sysuser}" /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 @@ -219,74 +226,57 @@ 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 root: ${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 - -## 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 +ynh_replace_string "^DAEMON_CONF=$" "&/etc/hostapd/hostapd.conf" /etc/init.d/hostapd # Fix sources -sed "s||${path_url}|g" -i /var/www/wifiadmin/config.php - -# Copy init script -install -o root -g root -m 0755 ../conf/$service_name /usr/local/bin/ +ynh_replace_string "__PATH__" "${path_url}" "$final_path/config.php" #================================================= # SETUP SYSTEMD #================================================= +ynh_print_info "Configuring a systemd service..." # Create a dedicated systemd config ynh_add_systemd_config $service_name -# Update firewall for DHCP -yunohost firewall allow --no-upnp --ipv6 UDP 547 -yunohost firewall allow --no-upnp UDP 67 - # Set default inits # The boot order of these services are important, so they are disabled by default # and the ynh-hotspot service handles them. systemctl disable hostapd systemctl stop hostapd -systemctl enable php5-fpm -systemctl restart php5-fpm #================================================= -# RELOAD NGINX +# RELOAD NGINX AND PHP-FPM #================================================= +ynh_print_info "Reloading nginx web server..." +systemctl reload php7.0-fpm systemctl reload nginx # Remove IPv6 address set if there is a VPN installed 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 From dcfb292d75012408f72e81fa97c080af830faee8 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 00:56:02 +0100 Subject: [PATCH 07/42] Fixing some errors --- scripts/install | 93 +++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/scripts/install b/scripts/install index 66a3662..831d5a9 100644 --- a/scripts/install +++ b/scripts/install @@ -86,23 +86,6 @@ fi source ./prerequisites -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) - - if [[ $vpnclient_ip6_net =~ :: && $vpnclient_ip6_addr =~ :: ]]; then - ip6_net=${vpnclient_ip6_net} - ip6_addr=${vpnclient_ip6_addr} - fi - fi -fi - -wifi_device=$(sudo bash ../conf/iw_devices | awk -F\| '{ print $1 }') - #================================================= # STORE SETTINGS FROM MANIFEST #================================================= @@ -114,30 +97,6 @@ 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" -ynh_app_setting_set $app multissid 1 -ynh_app_setting_set $app wifi_ssid "${wifi_ssid}" -ynh_app_setting_set $app wifi_secure 1 -ynh_app_setting_set $app wifi_passphrase "${wifi_passphrase}" -ynh_app_setting_set $app wifi_device "${wifi_device}" -ynh_app_setting_set $app wifi_channel 6 -ynh_app_setting_set $app ip6_addr "${ip6_addr}" -ynh_app_setting_set $app ip6_firewall 1 -ynh_app_setting_set $app ip6_net "${ip6_net}" -ynh_app_setting_set $app ip6_dns0 2001:913::8 -ynh_app_setting_set $app ip6_dns1 2001:910:800::12 -ynh_app_setting_set $app ip4_dns0 80.67.188.188 -ynh_app_setting_set $app ip4_dns1 80.67.169.12 -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 - -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 - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -222,6 +181,47 @@ 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=$(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} + ip6_addr=${vpnclient_ip6_addr} + fi + fi +fi + +wifi_device=$(sudo bash ../conf/iw_devices | awk -F\| '{ print $1 }') + +ynh_app_setting_set $app multissid 1 +ynh_app_setting_set $app wifi_ssid "${wifi_ssid}" +ynh_app_setting_set $app wifi_secure 1 +ynh_app_setting_set $app wifi_passphrase "${wifi_passphrase}" +ynh_app_setting_set $app wifi_device "${wifi_device}" +ynh_app_setting_set $app wifi_channel 6 +ynh_app_setting_set $app ip6_addr "${ip6_addr}" +ynh_app_setting_set $app ip6_firewall 1 +ynh_app_setting_set $app ip6_net "${ip6_net}" +ynh_app_setting_set $app ip6_dns0 2001:913::8 +ynh_app_setting_set $app ip6_dns1 2001:910:800::12 +ynh_app_setting_set $app ip4_dns0 80.67.188.188 +ynh_app_setting_set $app ip4_dns1 80.67.169.12 +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 + +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 + #================================================= # COPY CONFIGS #================================================= @@ -294,9 +294,12 @@ yunohost service add $service_name --description "creates a Wi-Fi access point" if [[ $wifi_device == none ]]; then echo "WARNING: Wifi Hotspot is not started because no wifi device was found (please, check the web admin)" >&2 else - ynh_systemctl enable $service_name - ynh_systemctl start $service_name + systemctl enable $service_name + systemctl start $service_name fi -# Reload SSOwat config -yunohost app ssowatconf +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info "Installation of $app completed" From d42cd3db100197adeb896ec2a90df3399d67b8a0 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 01:01:18 +0100 Subject: [PATCH 08/42] no more sudo --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 831d5a9..64b2c94 100644 --- a/scripts/install +++ b/scripts/install @@ -196,7 +196,7 @@ if [[ ! -v ip6_net ]]; then # if ip6_net not set fi fi -wifi_device=$(sudo bash ../conf/iw_devices | awk -F\| '{ print $1 }') +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}" From 35313a1242ed7181989b576f4fd8442639691b3d Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 01:01:32 +0100 Subject: [PATCH 09/42] changing file name --- conf/{ynh-hotspot.service => systemd.service} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename conf/{ynh-hotspot.service => systemd.service} (66%) diff --git a/conf/ynh-hotspot.service b/conf/systemd.service similarity index 66% rename from conf/ynh-hotspot.service rename to conf/systemd.service index 367601f..eb3107a 100644 --- a/conf/ynh-hotspot.service +++ b/conf/systemd.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=oneshot -ExecStart=/usr/local/bin/ynh-hotspot start -ExecStop=/usr/local/bin/ynh-hotspot stop +ExecStart=/usr/local/bin/__APP__ start +ExecStop=/usr/local/bin/__APP__ stop RemainAfterExit=yes [Install] From 23454dff027fdf457c694e7332d81794406d57a3 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 01:09:49 +0100 Subject: [PATCH 10/42] Don't need to reload php fpm --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index 64b2c94..df2b0e0 100644 --- a/scripts/install +++ b/scripts/install @@ -276,7 +276,6 @@ systemctl stop hostapd #================================================= ynh_print_info "Reloading nginx web server..." -systemctl reload php7.0-fpm systemctl reload nginx # Remove IPv6 address set if there is a VPN installed From 16e6e1582d002abe3be5cc0a09dfec9a145364f9 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 01:22:56 +0100 Subject: [PATCH 11/42] Update remove script --- scripts/remove | 87 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 18 deletions(-) diff --git a/scripts/remove b/scripts/remove index dcddddd..81c7eeb 100644 --- a/scripts/remove +++ b/scripts/remove @@ -35,24 +35,44 @@ 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 | grep -q $app +if yunohost service status | grep -q $service_name then - echo "Remove $app service" - yunohost service remove $app + ynh_print_info "Removing $app service" + 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 $service_name +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 @@ -61,14 +81,8 @@ 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 for FILE in $(ls /etc/hostapd/hostapd.conf{.tpl?,} 2>/dev/null) do ynh_secure_remove "$FILE" @@ -84,14 +98,51 @@ if [[ $firmware_nonfree -eq 0 ]]; then fi fi -ynh_remove_app_dependencies +#================================================= +# REMOVE NGINX CONFIGURATION +#================================================= +ynh_print_info "Removing nginx web server configuration" -# Restart services -systemctl restart php5-fpm -systemctl reload nginx +# Remove the dedicated nginx config +ynh_remove_nginx_config -# Remove sources -ynh_secure_remove /var/www/wifiadmin +#================================================= +# REMOVE PHP-FPM CONFIGURATION +#================================================= +ynh_print_info "Removing php-fpm configuration" -# Remove user -ynh_system_user_delete ${app} +# 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" From ff5fb06ea16e5662e3806962e27b4ff140ce6dcd Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 01:39:09 +0100 Subject: [PATCH 12/42] Fixing permission --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index df2b0e0..210e203 100644 --- a/scripts/install +++ b/scripts/install @@ -243,7 +243,7 @@ install -o root -g root -m 0755 ../conf/$service_name /usr/local/bin/ mkdir -pm 0755 ${final_path}/ cp -a ../sources/* ${final_path}/ -chown -R root: ${final_path}/ +chown -R www-data: ${final_path}/ chmod -R 0644 ${final_path}/* find ${final_path}/ -type d -exec chmod +x {} \; From 79ec958aaddb14ba0b759cba251b288309b26b43 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 01:40:10 +0100 Subject: [PATCH 13/42] Store checksum --- scripts/install | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/install b/scripts/install index 210e203..0b09bbd 100644 --- a/scripts/install +++ b/scripts/install @@ -257,6 +257,13 @@ ynh_replace_string "^DAEMON_CONF=$" "&/etc/hostapd/hostapd.conf" /etc/init.d/hos # Fix sources ynh_replace_string "__PATH__" "${path_url}" "$final_path/config.php" +#================================================= +# STORE THE CONFIG FILE CHECKSUM +#================================================= + +# Calculate and store the config file checksum into the app settings +ynh_store_file_checksum "$final_path/config.php" + #================================================= # SETUP SYSTEMD #================================================= From f519a9611b884a28b3d3a024a949aa14bb743713 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 02:04:57 +0100 Subject: [PATCH 14/42] More checksum --- scripts/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 0b09bbd..6985101 100644 --- a/scripts/install +++ b/scripts/install @@ -263,6 +263,7 @@ ynh_replace_string "__PATH__" "${path_url}" "$final_path/config.php" # 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 @@ -294,7 +295,7 @@ if [[ $ip6_addr != none ]]; then fi # register the service -yunohost service add $service_name --description "creates a Wi-Fi access point" +yunohost service add $service_name --description "Creates a Wi-Fi access point" # enable and start the service if device is present if [[ $wifi_device == none ]]; then From 76ebbd97e224bfdc7c82ed42fa279e511bfcdf04 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 02:05:34 +0100 Subject: [PATCH 15/42] Implementing backup script --- scripts/backup | 78 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 3 deletions(-) diff --git a/scripts/backup b/scripts/backup index f495de7..6be9da8 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,77 @@ 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) + +#================================================= +# 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 1 ]]; 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/$app.service" + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." From 4da218f982314529e8d89df96eeacc09f3d3225f Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 02:05:40 +0100 Subject: [PATCH 16/42] Implementing restore script --- scripts/restore | 134 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 126 insertions(+), 8 deletions(-) diff --git a/scripts/restore b/scripts/restore index a3e9ef8..3f0514d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= @@ -17,14 +17,132 @@ 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) -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 www-data: $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/$app.service" +systemctl enable $app.service + +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= + +yunohost service add $app --log "/var/log/$app/$app.log" + +#================================================= +# 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" From f1861e7ad45f295940d451427ac94cdc4c4f09f7 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 23 Feb 2019 02:12:04 +0100 Subject: [PATCH 17/42] Removing more files --- scripts/remove | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 81c7eeb..92b325f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -76,13 +76,22 @@ 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" + for FILE in $(ls /tmp/.ynh-hotspot-* 2>/dev/null) do ynh_secure_remove "$FILE" done # Remove confs -ynh_secure_remove /etc/dnsmasq.dhcpd +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" From 1618d3fbbb39c20b3ef99ec04589af52b706e135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sat, 23 Feb 2019 23:17:23 +0100 Subject: [PATCH 18/42] Fixing the install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 6985101..ac809df 100644 --- a/scripts/install +++ b/scripts/install @@ -284,6 +284,7 @@ systemctl stop hostapd #================================================= 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 From 5d3f8cadb0fca0c3a1a7bb606276280258706a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sat, 23 Feb 2019 23:19:14 +0100 Subject: [PATCH 19/42] Update check_process --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index b4206d2..b3f1fe8 100644 --- a/check_process +++ b/check_process @@ -13,12 +13,12 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=CommitHash + upgrade=1 from_commit=16b705afde210215c99e328f3417302dad89c63e backup_restore=1 multi_instance=0 incorrect_path=1 port_already_use=0 - change_url=1 + change_url=0 ;;; Levels Level 1=auto Level 2=auto From b7ae9f4973668255e7748651bdb0d35cdd67d921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sat, 23 Feb 2019 23:46:18 +0100 Subject: [PATCH 20/42] Store $packages --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index ac809df..4cb54d9 100644 --- a/scripts/install +++ b/scripts/install @@ -214,6 +214,7 @@ ynh_app_setting_set $app ip4_dns1 80.67.169.12 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 +ynh_app_setting_set $app packages $packages if [[ -z $wifi_device ]]; then ynh_app_setting_set $app service_enabled 0 From 7f480683ba920340a0f23e328a82f41302ac8d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sat, 23 Feb 2019 23:47:45 +0100 Subject: [PATCH 21/42] [WIP] Upgrade script --- scripts/upgrade | 143 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 123 insertions(+), 20 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index ffad59c..1e7ec6f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,7 +1,7 @@ #!/bin/bash #================================================= -# GENERIC STARTING +# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -9,26 +9,53 @@ 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) +packages=$(ynh_app_setting_get $app packages) + +#================================================= +# 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 [ -z $packages ]; then + if [[ $firmware_nonfree -eq 1 ]]; then + packages=$nonfree_packages + else + packages=$free_packages + fi + + ynh_app_setting_set $app packages $packages +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 @@ -37,19 +64,95 @@ multissid=$(ynh_app_setting_get $app multissid) # Normalize the URL path syntax path_url=$(ynh_normalize_url_path $path_url) +#================================================= +# STANDARD UPGRADE STEPS +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= +ynh_print_info "Upgrading source files..." + +# Download, check integrity, uncompress and patch the source from app.src +cp -a ../sources/* ${final_path}/ + +chown -R www-data: ${final_path}/ +chmod -R 0644 ${final_path}/* +find ${final_path}/ -type d -exec chmod +x {} \; + +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_print_info "Upgrading nginx web server configuration..." + +# Create a dedicated nginx config +ynh_add_nginx_config + +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_print_info "Upgrading dependencies..." + +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 +#================================================= -source ./prerequisites +### 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" -# Changes +#================================================= +# SETUP SYSTEMD +#================================================= +ynh_print_info "Upgrading systemd 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 systemd config +ynh_add_systemd_config - ynh_app_setting_set "${app}" ip6_firewall "${ip6_firewall}" -fi +#================================================= +# GENERIC FINALIZATION +#================================================= +# SECURE FILES AND DIRECTORIES +#================================================= -ynh_systemctl start ynh-hotspot +# Set permissions on app files +chown -R www-data: $final_path + +#================================================= +# SETUP SSOWAT +#================================================= +ynh_print_info "Upgrading SSOwat configuration..." + +#================================================= +# 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" \ No newline at end of file From 973dd5d2e95a79deb4b9ff89cb72d291ba6e4d30 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sun, 24 Feb 2019 20:42:52 +0100 Subject: [PATCH 22/42] service_name missing in Backup Script --- scripts/backup | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/backup b/scripts/backup index 6be9da8..12a7499 100644 --- a/scripts/backup +++ b/scripts/backup @@ -26,6 +26,7 @@ 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 From 7031d015be5edbf227ae1de1541801dc96801b61 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sun, 24 Feb 2019 21:00:28 +0100 Subject: [PATCH 23/42] fix service name --- scripts/backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/backup b/scripts/backup index 12a7499..15c39d0 100644 --- a/scripts/backup +++ b/scripts/backup @@ -83,7 +83,7 @@ ynh_backup "/etc/php/7.0/fpm/pool.d/$app.conf" #================================================= ynh_print_info "Backing up systemd configuration..." -ynh_backup "/etc/systemd/system/$app.service" +ynh_backup "/etc/systemd/system/$service_name.service" #================================================= # END OF SCRIPT From ec0fb4bc5d697241cc46fdeae4cfb088d3c3eb78 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sun, 24 Feb 2019 21:25:41 +0100 Subject: [PATCH 24/42] Fixing restore --- scripts/restore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 3f0514d..4592357 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,6 +27,7 @@ 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) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -122,8 +123,8 @@ ynh_install_app_dependencies "$pkg_dependencies" "$packages" #================================================= ynh_print_info "Restoring the systemd configuration..." -ynh_restore_file "/etc/systemd/system/$app.service" -systemctl enable $app.service +ynh_restore_file "/etc/systemd/system/$service_name.service" +systemctl enable $service_name.service #================================================= # ADVERTISE SERVICE IN ADMIN PANEL From d8667b93aea39b900548f3f907d989b6208c5323 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sun, 24 Feb 2019 22:04:02 +0100 Subject: [PATCH 25/42] Create folder in restore script --- scripts/restore | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/restore b/scripts/restore index 4592357..b68c023 100644 --- a/scripts/restore +++ b/scripts/restore @@ -64,6 +64,7 @@ if [[ $firmware_nonfree -eq 1 ]]; then else packages=$free_packages + mkdir -p /lib/firmware ynh_restore_file "/lib/firmware/htc_7010.fw" ynh_restore_file "/lib/firmware/htc_9271.fw" fi From 75f57d67acaa6cbe571a64aa77ec7ade8104c729 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sun, 24 Feb 2019 22:07:21 +0100 Subject: [PATCH 26/42] This app shouldn't be public --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index b3f1fe8..5cd32f5 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_root=1 setup_nourl=0 setup_private=1 - setup_public=1 + setup_public=0 upgrade=1 upgrade=1 from_commit=16b705afde210215c99e328f3417302dad89c63e backup_restore=1 From 854c8d16da8096939cf5774a71a62701fe1d2b98 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sun, 24 Feb 2019 22:12:58 +0100 Subject: [PATCH 27/42] Can't upgrade from the old version --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 5cd32f5..f4f5bb1 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_private=1 setup_public=0 upgrade=1 - upgrade=1 from_commit=16b705afde210215c99e328f3417302dad89c63e + upgrade=1 from_commit=75f57d67acaa6cbe571a64aa77ec7ade8104c729 backup_restore=1 multi_instance=0 incorrect_path=1 From 89b59655d5e664f35df4f8d52dd5dc01761aef3e Mon Sep 17 00:00:00 2001 From: Kayou Date: Sun, 24 Feb 2019 22:21:59 +0100 Subject: [PATCH 28/42] Fixing backup restore --- scripts/backup | 2 +- scripts/restore | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/backup b/scripts/backup index 15c39d0..a5790dd 100644 --- a/scripts/backup +++ b/scripts/backup @@ -37,7 +37,7 @@ ynh_print_info "Backing up the main app directory..." ynh_backup "$final_path" -if [[ $firmware_nonfree -eq 1 ]]; then +if [[ $firmware_nonfree -eq 0 ]]; then ynh_backup "/lib/firmware/htc_7010.fw" ynh_backup "/lib/firmware/htc_9271.fw" fi diff --git a/scripts/restore b/scripts/restore index b68c023..4592357 100644 --- a/scripts/restore +++ b/scripts/restore @@ -64,7 +64,6 @@ if [[ $firmware_nonfree -eq 1 ]]; then else packages=$free_packages - mkdir -p /lib/firmware ynh_restore_file "/lib/firmware/htc_7010.fw" ynh_restore_file "/lib/firmware/htc_9271.fw" fi From 3b9b327f6aa24f70b495c1f37d2e2694f1d77476 Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 26 Feb 2019 01:10:40 +0100 Subject: [PATCH 29/42] the file is ynh-hotspot not hotspot --- conf/systemd.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index eb3107a..367601f 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=oneshot -ExecStart=/usr/local/bin/__APP__ start -ExecStop=/usr/local/bin/__APP__ stop +ExecStart=/usr/local/bin/ynh-hotspot start +ExecStop=/usr/local/bin/ynh-hotspot stop RemainAfterExit=yes [Install] From a22dabea12d145548f6c594d0f7ea9455f852328 Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 26 Feb 2019 01:11:02 +0100 Subject: [PATCH 30/42] change chown --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index adeba1e..4da7acc 100644 --- a/scripts/install +++ b/scripts/install @@ -244,7 +244,7 @@ install -o root -g root -m 0755 ../conf/$service_name /usr/local/bin/ mkdir -pm 0755 ${final_path}/ cp -a ../sources/* ${final_path}/ -chown -R www-data: ${final_path}/ +chown -R $app: ${final_path}/ chmod -R 0644 ${final_path}/* find ${final_path}/ -type d -exec chmod +x {} \; From fd6172d2c7e9cd022ee373da536bf375b052e072 Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 26 Feb 2019 01:11:22 +0100 Subject: [PATCH 31/42] remove update (done by ynh_install_app_dependencies) --- scripts/install | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index 4da7acc..b621930 100644 --- a/scripts/install +++ b/scripts/install @@ -134,8 +134,6 @@ else install -b -o root -g root -m 0644 ../conf/firmware_htc-9271.fw /lib/firmware/htc_9271.fw fi -ynh_package_update - #================================================= # INSTALL DEPENDENCIES #================================================= From 4e940b3b41e48c8918f69ba3076fed539adfea4b Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 26 Feb 2019 01:11:59 +0100 Subject: [PATCH 32/42] remove improvement script --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 92b325f..63d80a6 100644 --- a/scripts/remove +++ b/scripts/remove @@ -44,7 +44,7 @@ final_path=$(ynh_app_setting_get $app final_path) #================================================= # Remove a service from the admin panel, added by `yunohost service add` -if yunohost service status | grep -q $service_name +if yunohost service status $service_name >/dev/null 2>&1 then ynh_print_info "Removing $app service" yunohost service remove $service_name From fab4ff8643fe14bbdd901ccd1b79f6ab31816a5a Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 26 Feb 2019 01:21:09 +0100 Subject: [PATCH 33/42] chown on upgrade and restore --- scripts/restore | 2 +- scripts/upgrade | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/scripts/restore b/scripts/restore index 4592357..92232d3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -100,7 +100,7 @@ ynh_system_user_create $app #================================================= # Restore permissions on app files -chown -R www-data: $final_path +chown -R $app: $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index f184588..a65191c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -74,10 +74,6 @@ ynh_print_info "Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src cp -a ../sources/* ${final_path}/ -chown -R www-data: ${final_path}/ -chmod -R 0644 ${final_path}/* -find ${final_path}/ -type d -exec chmod +x {} \; - #================================================= # NGINX CONFIGURATION #================================================= @@ -141,12 +137,9 @@ yunohost service start $service_name #================================================= # Set permissions on app files -chown -R www-data: $final_path - -#================================================= -# SETUP SSOWAT -#================================================= -ynh_print_info "Upgrading SSOwat configuration..." +chown -R $app: ${final_path}/ +chmod -R 0644 ${final_path}/* +find ${final_path}/ -type d -exec chmod +x {} \; #================================================= # RELOAD NGINX From e376c50ad6e2f678500a051b892f2062a8f944ca Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 26 Feb 2019 01:24:01 +0100 Subject: [PATCH 34/42] --need_lock on restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 92232d3..5a9c3d8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -130,7 +130,7 @@ systemctl enable $service_name.service # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log "/var/log/$app/$app.log" +yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock #================================================= # GENERIC FINALIZATION From b3ed0f43afe459fff720b6843f19509df2dcb08a Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 26 Feb 2019 01:27:39 +0100 Subject: [PATCH 35/42] Don't store packages in settings --- scripts/install | 1 - scripts/remove | 1 + scripts/upgrade | 17 ++++++----------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index b621930..57d7702 100644 --- a/scripts/install +++ b/scripts/install @@ -212,7 +212,6 @@ ynh_app_setting_set $app ip4_dns1 80.67.169.12 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 -ynh_app_setting_set $app packages $packages if [[ -z $wifi_device ]]; then ynh_app_setting_set $app service_enabled 0 diff --git a/scripts/remove b/scripts/remove index 63d80a6..06278fd 100644 --- a/scripts/remove +++ b/scripts/remove @@ -47,6 +47,7 @@ final_path=$(ynh_app_setting_get $app final_path) 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 diff --git a/scripts/upgrade b/scripts/upgrade index a65191c..3a10f06 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,6 @@ 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) -packages=$(ynh_app_setting_get $app packages) #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -33,16 +32,6 @@ if [ -z $final_path ]; then ynh_app_setting_set $app final_path $final_path fi -if [ -z $packages ]; then - if [[ $firmware_nonfree -eq 1 ]]; then - packages=$nonfree_packages - else - packages=$free_packages - fi - - ynh_app_setting_set $app packages $packages -fi - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -87,6 +76,12 @@ ynh_add_nginx_config #================================================= 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" #================================================= From 6971c9626af065b512e8c7fea91fd44047988201 Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 26 Feb 2019 01:29:05 +0100 Subject: [PATCH 36/42] tab --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 06278fd..ed519d1 100644 --- a/scripts/remove +++ b/scripts/remove @@ -47,7 +47,7 @@ final_path=$(ynh_app_setting_get $app final_path) if yunohost service status $service_name >/dev/null 2>&1 then ynh_print_info "Removing $app service" - yunohost service stop $service_name + yunohost service stop $service_name yunohost service remove $service_name fi From b118b790b9e5383ef1802d0836c1014eb87fd89d Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 26 Feb 2019 01:31:37 +0100 Subject: [PATCH 37/42] Retrieve service_name in upgrade script --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 3a10f06..4adf079 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,6 +20,7 @@ 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) #================================================= # ENSURE DOWNWARD COMPATIBILITY From 31f30fac54f983084d6d7279d96d89e9bc0efd2b Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 26 Feb 2019 08:48:04 +0100 Subject: [PATCH 38/42] Update remove --- scripts/remove | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index ed519d1..bbc43b5 100644 --- a/scripts/remove +++ b/scripts/remove @@ -97,7 +97,6 @@ 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 -eq 0 ]]; then From f7c255a9cfe355c92d67341e55066193f3595370 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sun, 10 Mar 2019 23:39:25 +0100 Subject: [PATCH 39/42] Fix the upgrade from an old commit --- check_process | 6 +++++- scripts/upgrade | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index f4f5bb1..27e6a68 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_private=1 setup_public=0 upgrade=1 - upgrade=1 from_commit=75f57d67acaa6cbe571a64aa77ec7ade8104c729 + upgrade=1 from_commit=546fd17712c7a9df428a4f26e7f8e4394884aaaf backup_restore=1 multi_instance=0 incorrect_path=1 @@ -30,3 +30,7 @@ Level 8=0 Level 9=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/scripts/upgrade b/scripts/upgrade index 4adf079..579e9d9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,6 +33,21 @@ if [ -z $final_path ]; then 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 + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -122,7 +137,6 @@ ynh_print_info "Upgrading systemd configuration..." ynh_add_systemd_config $service_name # Make sure that the yunohost service has a description and need-lock enabled -yunohost service remove $service_name yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock yunohost service start $service_name From 3757b70454d47836f79968ab3c9fadeceb238872 Mon Sep 17 00:00:00 2001 From: Kayou Date: Mon, 11 Mar 2019 00:44:58 +0100 Subject: [PATCH 40/42] fix service_name if empty --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 579e9d9..16ec71e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,6 +48,11 @@ elif [ $firmware_nonfree = "no" ]; then 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 #================================================= From 3f20eb42b4c86d9a9f9af72123c584c4b167e764 Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 19 Mar 2019 21:33:16 +0100 Subject: [PATCH 41/42] Restore firmware_nonfree to a choice --- check_process | 2 +- manifest.json | 5 +++-- scripts/install | 10 ++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/check_process b/check_process index 27e6a68..6e1fdb2 100644 --- a/check_process +++ b/check_process @@ -4,7 +4,7 @@ path="/path" (PATH) wifi_ssid="myNeutralNetwork" wifi_passphrase="VhegT8oev0jZI" (PASSWORD) - firmware_nonfree=0 + firmware_nonfree="no" ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/manifest.json b/manifest.json index 0dba5c1..7eb76f3 100644 --- a/manifest.json +++ b/manifest.json @@ -64,12 +64,13 @@ }, { "name": "firmware_nonfree", - "type": "boolean", + "type": "string", "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)" }, - "default": true + "choice": [ "yes", "no" ], + "default": "no" } ] } diff --git a/scripts/install b/scripts/install index 6c96340..65b634a 100644 --- a/scripts/install +++ b/scripts/install @@ -68,13 +68,15 @@ ynh_webpath_register $app $domain $path_url # 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 -#================================================= +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 From 5c604193e05f78179a4e1f2757affb9f279e0578 Mon Sep 17 00:00:00 2001 From: keoma Date: Sun, 7 Apr 2019 23:47:20 +0200 Subject: [PATCH 42/42] adding iw full path --- conf/iw_devices | 2 +- conf/iw_multissid | 4 ++-- conf/iw_ssids | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 ' ' \|