diff --git a/omr-bypass/files/etc/uci-defaults/41_omr-bypass b/omr-bypass/files/etc/uci-defaults/41_omr-bypass index d4cab9047..421083b1f 100755 --- a/omr-bypass/files/etc/uci-defaults/41_omr-bypass +++ b/omr-bypass/files/etc/uci-defaults/41_omr-bypass @@ -125,6 +125,7 @@ if [ "$(uci -q get omr-bypass.free)" = "" ]; then add_list omr-bypass.free.url='freebox.fr' add_list omr-bypass.free.url='oqee.tv' add_list omr-bypass.free.url='oqee.net' + add_list omr-bypass.free.url='proxad.net' commit omr-bypass EOF fi diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index 5aa951943..b5e6b66e2 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -79,6 +79,9 @@ _get_json() { else result=`curl --max-time 10 -s -k -H "accept: application/json" -H "Authorization: Bearer $token" https://[$server]:$serverport/$route` fi + if [ "$(echo $result | grep 'Could not validate credentials')" ]; then + result='' + fi echo $result } || { echo '' @@ -2264,6 +2267,8 @@ _config_service() { [ -z "$vps_config" ] && vps_config=$(_get_json "config") [ -z "$vps_config" ] && return + kernel="$(echo "$vps_config" | jsonfilter -q -e '@.vps.kernel')" + [ -z "$kernel" ] && return user_permission="$(echo "$vps_config" | jsonfilter -q -e '@.user.permission')" if [ "$user_permission" != "ro" ]; then