external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-12 17:07:23 +01:00
Code Issues Releases Wiki Activity

Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox

Browse Source 
# Conflicts:
#	setup/nextcloud.sh
This commit is contained in:
downtownallday
2023-06-16 17:32:28 -04:00
parent 1aab41e7fe 98628622c7
commit 3774a78b03
4 changed files with 69 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
setup/mods.available/hooks/remote-nextcloud-mgmt-hooks.py
View File

@@ -95,16 +95,12 @@ def do_hook_web_update(hook_name, hook_data, mods_env):
if start==-1:
log.error("no Nextcloud configuration found in nginx conf")
return False
end = str.find('\n\t# ', start) # this should match comment "# ssl files sha1:...", which is dynamically added by web_update.py:make_domain_config()
end = str.find('\n\t# ssl files ', start)
if end==0:
log.error("couldn't determine end of Nextcloud configuration")
return False
if str[end+4:end+4+9] != 'ssl files':
log.error("expected end replacement block comment to start with 'ssl files', but got '%s'", str[end+4:end+4+9])
return False
# ensure we're not eliminating lines that are not nextcloud
# related in the event that the conf/nginx-* templates change
#
@@ -135,6 +131,8 @@ def do_hook_web_update(hook_name, hook_data, mods_env):
rewrite ^/.well-known/carddav {nc_url}/remote.php/dav/ redirect;
rewrite ^/.well-known/caldav {nc_url}/remote.php/dav/ redirect;
rewrite ^/.well-known/webfinger {nc_url}/index.php/.well-known/webfinger redirect;
rewrite ^/.well-known/nodeinfo {nc_url}/index.php/.well-known/nodeinfo redirect;
"""
hook_data['nginx_conf'] = str[0:start] + template.format(nc_url=nc_url) + str[end:]