YunoHost-Apps/pihole_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pihole_ynh.git synced 2024-09-03 20:05:58 +02:00
Code Issues Activity Actions

Upgrade to 5.3.1

Browse source
This commit is contained in:
Kay0u 2021-06-30 18:04:29 +02:00
parent 0c0316a443
commit 08545d256b
No known key found for this signature in database
GPG key ID: AAFEEB16CFA2AE2D
13 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
## Overview ## Overview
Network-wide ad blocking via your own Linux hardware Network-wide ad blocking via your own Linux hardware
**Shipped version:** 3.3.1 or 5.0 **Shipped version:** 3.3.1 or 5.3.1
## Screenshots ## Screenshots

2
README_fr.md
View file

@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/inst
## Résumé ## Résumé
Blocage des publicités sur l'ensemble du réseau via votre propre matériel Linux Blocage des publicités sur l'ensemble du réseau via votre propre matériel Linux
**Version embarquée:** 3.3.1 ou 5.0 **Version embarquée:** 3.3.1 ou 5.3.1
## Captures d'écran ## Captures d'écran

4
conf/FTL_3.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://github.com/pi-hole/FTL/archive/v3.0.tar.gz SOURCE_URL=https://github.com/pi-hole/FTL/archive/v3.0.tar.gz
SOURCE_SUM=45fd33e4498b2ab9403d96e1251abb8c SOURCE_SUM=8c3d55eb3054698172e59ae81b8562ce235d73da461389840da62d90b32f0057
SOURCE_SUM_PRG=md5sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=

6
conf/FTL_last.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.0.tar.gz SOURCE_URL=https://github.com/pi-hole/FTL/archive/v5.8.1.tar.gz
SOURCE_SUM=a405fee9a924324eefe6bfb832180c3d SOURCE_SUM=6177f775a8d0be703b235741befe90b6192bdc0baab5a6e028019a9af00a44ae
SOURCE_SUM_PRG=md5sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=

4
conf/admin_dashboard_3.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v3.3.tar.gz SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v3.3.tar.gz
SOURCE_SUM=23368537fa576480e45f625b5e1a7cd7 SOURCE_SUM=caba2129fe8753b0c7aaf611b7c7b2146ff1ac56d5ac58987053b1553d09c49f
SOURCE_SUM_PRG=md5sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=

6
conf/admin_dashboard_last.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.0.tar.gz SOURCE_URL=https://github.com/pi-hole/AdminLTE/archive/v5.5.tar.gz
SOURCE_SUM=9402041b365e78a02a95942bdd3c3c05 SOURCE_SUM=39340eeb115732db7cf96166dfa9c7240afb0843b4f49defc42e704b751cf278
SOURCE_SUM_PRG=md5sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=

4
conf/app_3.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v3.3.1.tar.gz SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v3.3.1.tar.gz
SOURCE_SUM=ea4f64bdf88620f59a1b01c19253e4e3 SOURCE_SUM=6a80e4b6b38fc65df83459fe52f3a61623763709a077645f25ac9e29247e6d6d
SOURCE_SUM_PRG=md5sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=

6
conf/app_last.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.0.tar.gz SOURCE_URL=https://github.com/pi-hole/pi-hole/archive/v5.3.1.tar.gz
SOURCE_SUM=0f19aeefad3063c44f421de1ad21b233 SOURCE_SUM=19c856584f180b2ed5b3d0500cd3567f00e37fa9c493282bc119be8276cdddd9
SOURCE_SUM_PRG=md5sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=

2
conf/nginx.conf
View file

@ -14,7 +14,7 @@ location __PATH__/ {
try_files $uri $uri/ index.php; try_files $uri $uri/ index.php;
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; fastcgi_pass unix:/var/run/php/php7.3-fpm-__NAME__.sock;
fastcgi_index index.php; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
fastcgi_param REMOTE_USER $remote_user; fastcgi_param REMOTE_USER $remote_user;

6
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Network-wide ad blocking via your own DNS server.", "en": "Network-wide ad blocking via your own DNS server.",
"fr": "Filtrage publicitaire sur l'ensemble du réseau via votre propre serveur DNS." "fr": "Filtrage publicitaire sur l'ensemble du réseau via votre propre serveur DNS."
}, },
"version": "5.0~ynh1", "version": "5.3.1~ynh1",
"url": "https://pi-hole.net/", "url": "https://pi-hole.net/",
"license": "EUPL-1.2", "license": "EUPL-1.2",
"maintainer": { "maintainer": {
@ -14,12 +14,12 @@
"email": "maniackc_dev@crudelis.fr" "email": "maniackc_dev@crudelis.fr"
}, },
"requirements": { "requirements": {
"yunohost": ">= 3.8" "yunohost": ">= 4.2"
}, },
"multi_instance": false, "multi_instance": false,
"services": [ "services": [
"nginx", "nginx",
"php7.0-fpm" "php7.3-fpm"
], ],
"arguments": { "arguments": {
"install" : [ "install" : [

8
scripts/_variables
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Dependencies # Dependencies
app_depencencies="sqlite idn2 php7.0-sqlite3 nettle-dev libcap2-bin" app_depencencies="sqlite3 idn2 php7.3-sqlite3 nettle-dev libcap2-bin build-essential libgmp-dev m4 cmake libidn11-dev libreadline-dev xxd"
if [ "$YNH_APP_ARG_PIHOLE_VERSION" == "Last 3.X" ] if [ "$YNH_APP_ARG_PIHOLE_VERSION" == "Last 3.X" ]
then then
@ -9,7 +9,7 @@ then
dashboard_version=3.3 dashboard_version=3.3
FTL_version=3.0 FTL_version=3.0
else else
pihole_core_version=5.0 pihole_core_version=5.3.1
dashboard_version=5.0 dashboard_version=5.5
FTL_version=5.0 FTL_version=5.8.1
fi fi

1
scripts/install
View file

@ -217,6 +217,7 @@ fi
# Instead of downloading a binary file, we're going to compile it # Instead of downloading a binary file, we're going to compile it
( cd "$FTL_temp_path" ( cd "$FTL_temp_path"
ynh_exec_warn_less cmake .
ynh_exec_warn_less make ynh_exec_warn_less make
ynh_exec_warn_less make install ) ynh_exec_warn_less make install )
ynh_secure_remove --file="$FTL_temp_path" ynh_secure_remove --file="$FTL_temp_path"

1
scripts/upgrade
View file

@ -257,6 +257,7 @@ then
# Instead of downloading a binary file, we're going to compile it # Instead of downloading a binary file, we're going to compile it
( cd "$FTL_temp_path" ( cd "$FTL_temp_path"
ynh_exec_warn_less cmake .
ynh_exec_warn_less make ynh_exec_warn_less make
ynh_exec_warn_less make install ) ynh_exec_warn_less make install )
ynh_secure_remove --file="$FTL_temp_path" ynh_secure_remove --file="$FTL_temp_path"