Przeglądaj źródła

openvpn config fix

Danja Vasiliev 9 lat temu
rodzic
commit
3704d46e62

+ 1 - 1
openwrt/common/etc/config/openvpn

@@ -1,6 +1,6 @@
 package openvpn
 
 config openvpn superglue
-	option enabled 0
+	option enable 0
 	option config /etc/openvpn/sgvpn-client.conf
 

+ 2 - 0
openwrt/common/opt/lib/admin/admin2.cgi

@@ -394,10 +394,12 @@ sgOpenvpn() {
   logThis "enabling SG openvpn"
   if [[ $(doUci get sgopenvpnenable) == '0' ]]; then
     doUci set sgopenvpnenable '1' &&
+    doUci commit openvpn &&
     /etc/init.d/openvpn start &&
     showMesg 'VPN service enabled' '5'
   else
     doUci set sgopenvpnenable '0' &&
+    doUci commit openvpn &&
     /etc/init.d/openvpn stop &&
     showMesg 'VPN service disabled' '5'
   fi

+ 4 - 4
openwrt/tools/make_fw.sh

@@ -30,8 +30,8 @@ _BUILDS="$_PWD/../../../sg-builds"
 set +e
 
 ## dirs with platform specific files
-#_TARGETS='DIR505A1 TLWR710' ##WRT160NL
-_TARGETS='TLWR710'
+_TARGETS='DIR505A1 TLWR710' ##WRT160NL
+#_TARGETS='TLWR710'
 
 ## dir with common files
 _COMMON='common'
@@ -53,7 +53,7 @@ let _MINOR++
 _OPENWRT_REVISION="$_PWD/openwrt.revision"
 
 ## browser extension (if any)
-_EXT_SRC="$_PWD/../../editor/build/superglue-firefox.xpi"
+#_EXT_SRC="$_PWD/../../editor/build/superglue-firefox.xpi"
 
 ## get OpenWRT revision
 _OPENWRT=$(fgrep -m1 'REVISION:=' $_IMAGEBUILDER/include/version.mk || echo 'r00000')
@@ -119,7 +119,7 @@ for _TARGET in $_TARGETS; do
   ## currently unused packages
   # kmod-fs-vfat kmod-fs-btrfs btrfs-progs kmod-fs-ext4 sudo 
 
-  make image PROFILE=$_TARGET PACKAGES="bash gawk openssh-sftp-server haserl lighttpd lighttpd-mod-access lighttpd-mod-cgi lighttpd-mod-compress lighttpd-mod-accesslog lighttpd-mod-rewrite lighttpd-mod-auth lighttpd-mod-alias lighttpd-mod-proxy lighttpd-mod-setenv blkid block-mount mini-sendmail kmod-usb-storage kmod-scsi-generic mount-utils kmod-nls-cp437 kmod-nls-iso8859-1 kmod-nls-utf8 kmod-nls-base coreutils-stat mini-httpd-htpasswd wireless-tools avahi-daemon kmod-fs-btrfs btrfs-progs swap-utils sfdisk coreutils-base64 coreutils-sha1sum rpcd-mod-iwinfo procps-ps uhttpd uhttpd-mod-ubus openvpn-openssl dtach" FILES=$_PWD/$_TARGET.tmp BIN_DIR=$_BIN_DIR/openwrt
+  make image PROFILE=$_TARGET PACKAGES="bash gawk openssh-sftp-server haserl lighttpd lighttpd-mod-access lighttpd-mod-cgi lighttpd-mod-compress lighttpd-mod-accesslog lighttpd-mod-rewrite lighttpd-mod-auth lighttpd-mod-alias lighttpd-mod-proxy lighttpd-mod-setenv blkid block-mount mini-sendmail kmod-usb-storage kmod-scsi-generic mount-utils kmod-nls-cp437 kmod-nls-iso8859-1 kmod-nls-utf8 kmod-nls-base coreutils-stat mini-httpd-htpasswd wireless-tools avahi-daemon kmod-fs-btrfs btrfs-progs swap-utils sfdisk coreutils-base64 coreutils-sha1sum rpcd-mod-iwinfo procps-ps uhttpd uhttpd-mod-ubus openvpn-openssl dtach curl" FILES=$_PWD/$_TARGET.tmp BIN_DIR=$_BIN_DIR/openwrt
   _ERR=$?
   if [[ $_ERR -gt 0 ]]; then
     echo -e "\nFAILED to build $_TARGET image :/ (are we missing packages?) \n"