External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-09 14:42:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

library.sh,1.54.0.sh: Remove invalid trusted_proxies

Browse Source 
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
This commit is contained in:
Tobias K 2024-04-30 01:03:41 +02:00
parent 5d0f9eec91
commit 218a6584a7
No known key found for this signature in database
GPG Key ID: 44FD368932E645C1
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/vm-tests.yml vendored
View File

@ -43,7 +43,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
path: /home/runner/actions-runner/_work/nextcloudpi/nextcloudpi
path: /__w/nextcloudpi/nextcloudpi
- name: Generate ssh keypair
working-directory: /__w/nextcloudpi/nextcloudpi
run: |

3
etc/library.sh
View File

@ -157,7 +157,8 @@ function set-nc-domain()
ncc config:system:set trusted_proxies 11 --value="127.0.0.1"
ncc config:system:set trusted_proxies 12 --value="::1"
# ncc config:system:set trusted_proxies 13 --value="${domain}"
ncc config:system:set trusted_proxies 14 --value="$(dig +short "${domain}")"
local domain_ip="$(dig +short "${domain}")"
[[ -z "$domain_ip" ]] || ncc config:system:set trusted_proxies 14 --value="$(dig +short "${domain}")"
sleep 5 # this seems to be required in the VM for some reason. We get `http2 error: protocol error` after ncp-upgrade-nc
for try in {1..5}
do

4
updates/1.54.0.sh
View File

@ -9,8 +9,8 @@ fi
for i in {10..15}
do
proxy="$(ncc config:system:get trusted_proxies "$i")"
[[ -z "$proxy" ]] || python3 -c "import ipaddress; ipaddress.ip_address('${proxy}')" || ncc config:system:delete trusted_proxies "$i"
proxy="$(ncc config:system:get trusted_proxies "$i" || echo 'NONE')"
[[ "$proxy" == 'NONE' ]] || python3 -c "import ipaddress; ipaddress.ip_address('${proxy}')" || ncc config:system:delete trusted_proxies "$i"
done
apt-key adv --fetch-keys https://packages.sury.org/php/apt.gpg