YunoHost-Apps/seafile_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/seafile_ynh.git synced 2024-09-03 20:26:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Josué Tille 2017-07-01 12:13:57 +02:00
commit d20de21fd4
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
conf/add_sso_conf.py
View file

@ -2,11 +2,11 @@ import json
with open("/etc/ssowat/conf.json.persistent", "r") as jsonFile: with open("/etc/ssowat/conf.json.persistent", "r") as jsonFile:
data = json.load(jsonFile) data = json.load(jsonFile)
if "unprotected_urls" in data: if "skipped_urls" in data:
data["unprotected_urls"].append("/seafhttp") data["skipped_urls"].append("/seafhttp")
else: else:
data["unprotected_urls"] = ["/seafhttp"] data["skipped_urls"] = ["/seafhttp"]
data["unprotected_urls"].append("/seafdav") data["skipped_urls"].append("/seafdav")
with open("/etc/ssowat/conf.json.persistent", "w") as jsonFile: with open("/etc/ssowat/conf.json.persistent", "w") as jsonFile:
jsonFile.write(json.dumps(data, indent=4, sort_keys=True)) jsonFile.write(json.dumps(data, indent=4, sort_keys=True))

4
conf/remove_sso_conf.py
View file

@ -2,8 +2,8 @@ import json
with open("/etc/ssowat/conf.json.persistent", "r") as jsonFile: with open("/etc/ssowat/conf.json.persistent", "r") as jsonFile:
data = json.load(jsonFile) data = json.load(jsonFile)
data["unprotected_urls"].remove("/seafhttp") data["skipped_urls"].remove("/seafhttp")
data["unprotected_urls"].remove("/seafdav") data["skipped_urls"].remove("/seafdav")
with open("/etc/ssowat/conf.json.persistent", "w") as jsonFile: with open("/etc/ssowat/conf.json.persistent", "w") as jsonFile:
jsonFile.write(json.dumps(data, indent=4, sort_keys=True)) jsonFile.write(json.dumps(data, indent=4, sort_keys=True))

4
scripts/_common.sh
View file

@ -39,10 +39,10 @@ get_source() {
md5sum=$armsum md5sum=$armsum
elif [[ $1 == 'x86-64' ]] elif [[ $1 == 'x86-64' ]]
then then
wget -q -O '/tmp/seafile_src.tar.gz' 'https://bintray.com/artifact/download/seafile-org/seafile/seafile-server_'$2'_x86-64.tar.gz' wget -q -O '/tmp/seafile_src.tar.gz' 'https://download.seadrive.org/seafile-server_'$2'_x86-64.tar.gz'
md5sum=$x86_64sum md5sum=$x86_64sum
else else
wget -q -O '/tmp/seafile_src.tar.gz' 'https://bintray.com/artifact/download/seafile-org/seafile/seafile-server_'$2'_i386.tar.gz' wget -q -O '/tmp/seafile_src.tar.gz' 'https://download.seadrive.org/seafile-server_'$2'_i386.tar.gz'
md5sum=$i386sum md5sum=$i386sum
fi fi