Improve Install script

Author: DavBfr

Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-openvpn-server
-PKG_VERSION=1.0
+PKG_VERSION=1.1
 PKG_RELEASE:=0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

src/gen_openvpn_server_keys.sh

@@ -65,3 +65,48 @@ EOF
 }
 chmod 600 "$CAKEY"
 chmod 600 "$CKEY"
+
+ip=`ubus call network.interface.wan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';`
+
+uci set ovpnauth.settings.external_ip=$ip
+uci commit ovpnauth.settings
+
+uci set openvpn.openvpn_server=openvpn
+uci set openvpn.openvpn_server.port=1194
+uci set openvpn.openvpn_server.proto=udp
+uci set openvpn.openvpn_server.dev=tun
+uci set openvpn.openvpn_server.ca=$CA
+uci set openvpn.openvpn_server.cert=$CERT
+uci set openvpn.openvpn_server.key=$KEY
+uci set openvpn.openvpn_server.dh=$DH
+uci set openvpn.openvpn_server.server="10.8.0.0 255.255.255.0"
+uci set openvpn.openvpn_server.ifconfig_pool_persist=/tmp/ipp.txt
+uci set openvpn.openvpn_server.client_to_client=1
+uci set openvpn.openvpn_server.remote_cert_tls=client
+uci set openvpn.openvpn_server.verb=3
+uci delete openvpn.openvpn_server.push
+uci add_list openvpn.openvpn_server.push="redirect-gateway"
+uci add_list openvpn.openvpn_server.push="dhcp-option DNS 10.8.0.1"
+uci set openvpn.openvpn_server.keepalive="10 120"
+uci set openvpn.openvpn_server.tls_auth="$TA 0"
+uci set openvpn.openvpn_server.cipher=BF-CBC
+uci set openvpn.openvpn_server.compress=lzo
+uci set openvpn.openvpn_server.persist_key=1
+uci set openvpn.openvpn_server.persist_tun=1
+uci set openvpn.openvpn_server.status=/tmp/openvpn-status.log
+uci set openvpn.openvpn_server.script_security=2
+uci set openvpn.openvpn_server.auth_user_pass_verify="/usr/bin/ovpnauth.sh via-file"
+uci set openvpn.openvpn_server.username_as_common_name=1
+uci set openvpn.openvpn_server.enabled=1
+uci delete openvpn.openvpn_server.user
+uci delete openvpn.openvpn_server.group
+uci commit openvpn.openvpn_server
+
+uci set network.ovpn=interface
+uci set network.ovpn.auto=1
+uci set network.ovpn.ifname=tun0
+uci set network.ovpn.proto=none
+uci set network.ovpn.auto=1
+uci commit network.ovpn
+
+/etc/init.d/openvpn restart

src/ovpnauth-mod.lua

@@ -116,70 +116,27 @@ m1 = Map("openvpn", translate("OpenVPN Server"))
 s1 = m1:section(NamedSection, "openvpn_server", "openvpn")
 
 o = s1:option(Value, "port", translate("Server port"))
-o.default = 1194
 
 o = s1:option(ListValue, "proto", translate("Protocol"))
 o:value("tcp", "TCP")
 o:value("udp", "UDP")
-o.default = "udp"
 
 o = s1:option(Value,"server",translate("Addresses range"))
-o.default = "10.8.0.0 255.255.255.0"
 
 o = s1:option(Flag, "enabled", translate("Enabled"))
-o.default = true
 
 o = s1:option(DynamicList, "push", translate("Push options to peer"))
-o.default = {"redirect-gateway", "dhcp-option DNS 10.8.0.1"}
 
 o = s1:option(Flag, "client_to_client", translate("Allow client-to-client traffic"))
-o.default = true
 
-o = s1:option(ListValue, "verb", translate("Set output verbosity"))
+o = s1:option(ListValue, "verb", translate("Set log level"))
 o:value("0", "No log")
 o:value("3", "Normal log")
 o:value("5", "Dump traffic")
 o:value("11", "Debug")
 
-local params = {
-	{"dev", "tun", translate("Type of used device")},
-	{"ca", "/etc/openvpn/ca.crt", translate("Certificate authority")},
-	{"cert", "/etc/openvpn/server.crt", translate("Local certificate")},
-	{"key", "/etc/openvpn/server.key", translate("Local private key")},
-	{"dh", "/etc/openvpn/dh1024.pem", translate("Diffie Hellman parameters")},
-	{"ifconfig_pool_persist", "/tmp/ipp.txt", translate("Persist/unpersist ifconfig-pool")},
-	{"remote_cert_tls", "client", translate("Require explicit key usage on certificate")},
-	{"keepalive", "10 120", translate("Keepalive")},
-	{"tls_auth", "/etc/openvpn/ta.key 0", translate("Additional authentication over TLS")},
-	{"cipher", "BF-CBC", translate("Encryption cipher for packets")},
-	{"compress", "lzo", translate("Copmression")},
-	{"persist_key", "1", translate("Don't re-read key on restart")},
-	{"persist_tun", "1", translate("Keep tun/tap device open on restart")},
-	{"status", "/tmp/openvpn-status.log", translate("Write status to file every n seconds")},
-	{"script_security", "2", translate("Policy level over usage of external programs an)d scripts")},
-	{"auth_user_pass_verify", "/usr/bin/ovpnauth.sh via-file", translate("Script used to authenticate users")},
-	{"username_as_common_name", "1", translate("Use username as common name")}
-}
-
-for _, option in ipairs(params) do
-	local o = s1:option(HiddenValue, option[1], option[3])
-	o.default = option[2]
-end
-
 function m1.on_after_commit(self)
 	sys.call("/etc/init.d/openvpn reload")
 end
 
-function m1.on_save(self)
-	local section = self.uci:section("openvpn", "openvpn", "openvpn_server")
-	self.uci:delete("openvpn", section, "user")
-	self.uci:delete("openvpn", section, "group")
-
-	local section = self.uci:section("network", "interface", "ovpn")
-	self.uci:set("network", section, "auto", "1")
-	self.uci:set("network", section, "ifname", "tun0")
-	self.uci:set("network", section, "proto", "none")
-	self.uci:set("network", section, "auto", "1")
-end
-
 return m,m1

src/ovpnauth.config

@@ -1,5 +1,2 @@
-
 config settings 'settings'
 	option external_ip '192.168.1.1'
-	option external_port '1194'
-	option proto 'udp'