Skip to content

Trusted domains #2477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enoch85 merged 21 commits into from
Apr 25, 2023
Merged

Trusted domains #2477

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
417e658
Update trusted.sh
enoch85 Apr 24, 2023
61080c5
SC
enoch85 Apr 24, 2023
92ff045
Update nextcloud-startup-script.sh
enoch85 Apr 24, 2023
2b65b1b
Update test-new-config.sh
enoch85 Apr 24, 2023
c23c04d
Delete trusted.sh
enoch85 Apr 24, 2023
e3c2f40
Delete update-config.php
enoch85 Apr 24, 2023
4ce92fe
Delete trusted.sh
enoch85 Apr 24, 2023
74ebd1d
Create trusted.sh
enoch85 Apr 24, 2023
c85be42
Update trusted.sh
enoch85 Apr 24, 2023
5f19e1e
Update test-new-config.sh
enoch85 Apr 24, 2023
0b33bb7
Update trusted.sh
enoch85 Apr 24, 2023
f7c54cd
Update nextcloud-startup-script.sh
enoch85 Apr 24, 2023
d000fdd
Update nextcloud-startup-script.sh
enoch85 Apr 24, 2023
0d0303e
Update trusted.sh
enoch85 Apr 24, 2023
a424553
Update test-new-config.sh
enoch85 Apr 24, 2023
68ab24e
Update trusted.sh
enoch85 Apr 24, 2023
fd3ea19
Update nextcloud-startup-script.sh
enoch85 Apr 24, 2023
ea1ce58
Update test-new-config.sh
enoch85 Apr 25, 2023
b191781
Update trusted.sh
enoch85 Apr 25, 2023
8682173
Update nextcloud-startup-script.sh
enoch85 Apr 25, 2023
d04c58c
Merge branch 'master' into trusted-domains
enoch85 Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions network/trusted.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,8 @@ source /var/scripts/fetch_lib.sh
DEBUG=0
debug_mode

download_script NETWORK update-config
if [ -f $SCRIPTS/update-config.php ]
then
# Change config.php
php $SCRIPTS/update-config.php $NCPATH/config/config.php 'trusted_domains[]' localhost "${ADDRESS[@]}" "$(hostname)" "$(hostname --fqdn)" >/dev/null 2>&1
php $SCRIPTS/update-config.php $NCPATH/config/config.php overwrite.cli.url https://"$(hostname --fqdn)"/ >/dev/null 2>&1
# Change config.php
nextcloud occ config:system:set trusted_domains 3 --value="${ADDRESS[@]}" "$(hostname)" "$(hostname --fqdn)"
nextcloud occ config:system:set overwrite.cli.url --value="https://$(hostname --fqdn)"
nextcloud_occ maintenance:update:htaccess

# Change .htaccess accordingly
sed -i "s|RewriteBase /nextcloud|RewriteBase /|g" $NCPATH/.htaccess

# Cleanup
rm -f $SCRIPTS/update-config.php
fi
4 changes: 3 additions & 1 deletion nextcloud-startup-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,9 @@ mesg n
ROOTNEWPROFILE

# Set trusted domain in config.php
run_script NETWORK trusted
nextcloud occ config:system:set trusted_domains 3 --value="${ADDRESS[@]}" "$(hostname)" "$(hostname --fqdn)"
nextcloud occ config:system:set overwrite.cli.url --value="https://$(hostname --fqdn)"
nextcloud_occ maintenance:update:htaccess

# Upgrade system
print_text_in_color "$ICyan" "System will now upgrade..."
Expand Down