refactor: correct typo

api/pb/user.pb.go

@@ -156,7 +156,7 @@ func (*UserListRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, [
 type UserCreateRequest struct {
 	Username string `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
 	Password string `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
-	NoGW     bool   `protobuf:"varint,3,opt,name=no_gW,json=noGW" json:"no_gW,omitempty"`
+	NoGw     bool   `protobuf:"varint,3,opt,name=no_gw,json=noGw" json:"no_gw,omitempty"`
 	HostId   uint32 `protobuf:"varint,4,opt,name=host_id,json=hostId" json:"host_id,omitempty"`
 	IsAdmin  bool   `protobuf:"varint,5,opt,name=is_admin,json=isAdmin" json:"is_admin,omitempty"`
 }
@@ -180,9 +180,9 @@ func (m *UserCreateRequest) GetPassword() string {
 	return ""
 }
 
-func (m *UserCreateRequest) GetNoGW() bool {
+func (m *UserCreateRequest) GetNoGw() bool {
 	if m != nil {
-		return m.NoGW
+		return m.NoGw
 	}
 	return false
 }
@@ -664,51 +664,51 @@ var _UserService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("user.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 735 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xe1, 0x6e, 0xd3, 0x30,
-	0x10, 0xc7, 0x97, 0xac, 0x4d, 0x9b, 0x6b, 0xc7, 0x32, 0x77, 0x63, 0x59, 0xd9, 0xa0, 0x04, 0x09,
-	0x55, 0x43, 0x6a, 0xa1, 0xec, 0x03, 0x9a, 0x10, 0x52, 0xb5, 0x41, 0x99, 0x04, 0xe9, 0x48, 0x37,
-	0xf5, 0x63, 0x94, 0x36, 0x5e, 0x89, 0xd4, 0x39, 0xc1, 0x4e, 0xd7, 0xef, 0x48, 0x3c, 0x01, 0xbc,
-	0x02, 0x8f, 0xc0, 0x93, 0xf0, 0x0a, 0x48, 0xbc, 0x06, 0xb2, 0x9d, 0xb4, 0xcb, 0xe8, 0x50, 0x3f,
-	0xf0, 0xcd, 0xe7, 0xbb, 0xfb, 0xf9, 0x72, 0xbe, 0xbf, 0x03, 0x30, 0x61, 0x98, 0x36, 0x22, 0x1a,
-	0xc6, 0x21, 0x52, 0xa3, 0x41, 0x75, 0x77, 0x14, 0x86, 0xa3, 0x31, 0x6e, 0x7a, 0x51, 0xd0, 0xf4,
-	0x08, 0x09, 0x63, 0x2f, 0x0e, 0x42, 0xc2, 0x64, 0x84, 0xb5, 0x01, 0xeb, 0xe7, 0x0c, 0xd3, 0x77,
-	0x01, 0x8b, 0x1d, 0xfc, 0x69, 0x82, 0x59, 0x6c, 0x7d, 0x53, 0x60, 0x83, 0xef, 0x1d, 0x51, 0xec,
-	0xc5, 0x38, 0xd9, 0x45, 0x55, 0x28, 0x72, 0x30, 0xf1, 0x2e, 0xb1, 0xa9, 0xd4, 0x94, 0xba, 0xee,
-	0xcc, 0x6c, 0xee, 0x8b, 0x3c, 0xc6, 0xa6, 0x21, 0xf5, 0x4d, 0x55, 0xfa, 0x52, 0x1b, 0x55, 0x20,
-	0x4f, 0x42, 0x77, 0xd4, 0x37, 0x57, 0x6b, 0x4a, 0xbd, 0xe8, 0xe4, 0x48, 0xd8, 0xe9, 0xa3, 0x6d,
-	0x28, 0x7c, 0x0c, 0x59, 0xec, 0x06, 0xbe, 0x99, 0xab, 0x29, 0xf5, 0x35, 0x47, 0xe3, 0xe6, 0x89,
-	0x8f, 0x76, 0xa0, 0x18, 0x30, 0xd7, 0xf3, 0x2f, 0x03, 0x62, 0xe6, 0x45, 0x42, 0x21, 0x60, 0x6d,
-	0x6e, 0x5a, 0x3f, 0x56, 0x65, 0x59, 0xe7, 0x91, 0xff, 0x1f, 0xca, 0x3a, 0x00, 0x6d, 0x34, 0x8d,
-	0x28, 0xbe, 0x10, 0x75, 0xdd, 0x69, 0xed, 0x36, 0xa2, 0x41, 0xe3, 0x2f, 0x7c, 0xa3, 0xd3, 0x3f,
-	0xa5, 0xf8, 0xc2, 0x49, 0x62, 0x6f, 0xaf, 0xbb, 0x0d, 0x25, 0xc6, 0x1b, 0x3b, 0x74, 0x05, 0x33,
-	0x2f, 0x98, 0xb5, 0xc5, 0xcc, 0x9e, 0x08, 0x14, 0x5c, 0x60, 0xb3, 0x35, 0x7a, 0x05, 0x20, 0xbe,
-	0x5b, 0x12, 0x34, 0x41, 0x78, 0xb0, 0x98, 0x20, 0x1a, 0x22, 0x00, 0xba, 0x97, 0x2e, 0xad, 0xc7,
-	0xa0, 0xc9, 0x6a, 0x11, 0x80, 0x66, 0x77, 0x4f, 0x9d, 0xd7, 0x6f, 0x8c, 0x15, 0x54, 0x84, 0x9c,
-	0xdd, 0xed, 0xf4, 0x0d, 0x05, 0x69, 0xa0, 0x76, 0xfa, 0x86, 0x6a, 0xbd, 0x00, 0x98, 0x57, 0x80,
-	0x0c, 0x28, 0xcb, 0xd8, 0xde, 0x59, 0xfb, 0xec, 0xe4, 0xc8, 0x58, 0x41, 0x65, 0x28, 0xda, 0xdd,
-	0xc4, 0x52, 0x38, 0x2b, 0x59, 0xab, 0xd6, 0x01, 0xe8, 0xb3, 0x93, 0xd1, 0x3a, 0x94, 0x64, 0x62,
-	0xfb, 0xf8, 0xfd, 0x89, 0x6d, 0xac, 0xa0, 0x12, 0x14, 0xec, 0xae, 0x34, 0x14, 0xa4, 0x43, 0x5e,
-	0x2e, 0x55, 0xab, 0x29, 0xaf, 0xed, 0x18, 0x8f, 0xf1, 0x52, 0xd7, 0x66, 0x35, 0xc0, 0xe0, 0x09,
-	0x0e, 0x26, 0x78, 0xba, 0x4c, 0x7c, 0x0b, 0x36, 0x79, 0x7c, 0x07, 0x93, 0xa3, 0x90, 0x5c, 0x04,
-	0xa3, 0x65, 0x72, 0xbe, 0xab, 0x50, 0x96, 0x87, 0xb0, 0x28, 0x24, 0x0c, 0xa3, 0x27, 0x90, 0xe7,
-	0x4e, 0x66, 0x2a, 0xb5, 0xd5, 0x7a, 0xa9, 0xb5, 0x95, 0x36, 0x3e, 0x0d, 0x90, 0x86, 0x8c, 0xa9,
-	0xfe, 0x56, 0x20, 0xc7, 0xed, 0x7f, 0x4e, 0xdf, 0x53, 0xd8, 0x64, 0x98, 0x5e, 0x61, 0xea, 0x32,
-	0x4c, 0x03, 0x6f, 0xec, 0x92, 0xc9, 0xe5, 0x00, 0xd3, 0x64, 0x12, 0x91, 0xf4, 0xf5, 0x84, 0xcb,
-	0x16, 0x1e, 0x84, 0x20, 0x37, 0xc4, 0x34, 0x16, 0x13, 0xa9, 0x3b, 0x62, 0x8d, 0xf6, 0x00, 0x86,
-	0x42, 0x87, 0xbe, 0xeb, 0xc5, 0x62, 0xe8, 0x74, 0x47, 0x4f, 0x76, 0xda, 0x31, 0xda, 0x02, 0x2d,
-	0x88, 0x5c, 0x82, 0x63, 0x31, 0x72, 0xba, 0x93, 0x0f, 0x22, 0x1b, 0xc7, 0xa9, 0xe8, 0xa6, 0x62,
-	0x8c, 0xa4, 0xe8, 0xa6, 0xd7, 0x87, 0xb7, 0x70, 0xab, 0xe8, 0x8a, 0x59, 0xd1, 0xbd, 0x84, 0xad,
-	0x1b, 0xbd, 0x4d, 0xfa, 0xf5, 0x08, 0xd6, 0x86, 0xe3, 0x00, 0x93, 0xd8, 0x1d, 0x0a, 0x47, 0xf2,
-	0xf9, 0x65, 0xb9, 0x29, 0x83, 0x5b, 0x5f, 0x72, 0x50, 0xe2, 0xe9, 0x3d, 0x4c, 0xaf, 0x82, 0x21,
-	0x46, 0x6f, 0x21, 0xc7, 0x1f, 0x1a, 0x54, 0x49, 0xbb, 0x7b, 0xed, 0xd9, 0xa9, 0x1a, 0x37, 0x5b,
-	0x6e, 0xed, 0x7c, 0xfe, 0xf9, 0xeb, 0xab, 0x5a, 0x41, 0x1b, 0xe2, 0xed, 0xba, 0x7a, 0xd6, 0xe4,
-	0xbd, 0x6d, 0x8e, 0x39, 0xe1, 0x03, 0x68, 0xf2, 0x79, 0x42, 0xb3, 0x9b, 0xca, 0x3c, 0x57, 0x0b,
-	0x68, 0xf7, 0x05, 0xcd, 0xb4, 0x2a, 0x19, 0x9a, 0x6c, 0xe5, 0xa1, 0xb2, 0xcf, 0x91, 0x52, 0x65,
-	0x73, 0x64, 0x46, 0x75, 0x4b, 0x23, 0x27, 0x22, 0x2b, 0x41, 0xca, 0xb1, 0x9f, 0x23, 0x33, 0x32,
-	0x58, 0x1a, 0xe9, 0x8b, 0x2c, 0x8e, 0xb4, 0x21, 0x2f, 0x84, 0x81, 0x36, 0xe7, 0xa9, 0x73, 0x9d,
-	0x2c, 0x00, 0xee, 0x09, 0xe0, 0xb6, 0x85, 0x32, 0x40, 0xca, 0x93, 0x38, 0x6f, 0x08, 0xfa, 0xec,
-	0x72, 0x91, 0x99, 0x66, 0xdf, 0xd4, 0x52, 0x75, 0x67, 0x81, 0x27, 0x39, 0xe0, 0xa1, 0x38, 0xe0,
-	0x9e, 0x75, 0x37, 0x73, 0xc0, 0x08, 0x13, 0x39, 0x18, 0x87, 0xca, 0xfe, 0x40, 0x13, 0xff, 0x9a,
-	0xe7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x22, 0x5f, 0xcb, 0x9b, 0x06, 0x00, 0x00,
+	// 731 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x51, 0x6e, 0xd3, 0x4c,
+	0x10, 0xc7, 0x6b, 0x37, 0x76, 0xe2, 0x49, 0xfa, 0xd5, 0xdd, 0xb4, 0x5f, 0xdd, 0xd0, 0x42, 0x30,
+	0x12, 0x8a, 0x8a, 0x94, 0x40, 0xe8, 0x03, 0xaa, 0x10, 0x52, 0xd4, 0x42, 0xa8, 0x04, 0x4e, 0x71,
+	0x5a, 0xf5, 0xd1, 0x72, 0xec, 0x6d, 0xb0, 0x94, 0xae, 0xcd, 0xae, 0xd3, 0xbc, 0x23, 0x71, 0x02,
+	0xb8, 0x02, 0x47, 0xe0, 0x24, 0x5c, 0x01, 0x89, 0x6b, 0xa0, 0xdd, 0x75, 0x12, 0x5c, 0x52, 0x94,
+	0x07, 0xde, 0x76, 0x76, 0x66, 0x7e, 0x3b, 0x9e, 0x9d, 0xff, 0x1a, 0x60, 0xcc, 0x30, 0x6d, 0x26,
+	0x34, 0x4e, 0x63, 0xa4, 0x26, 0x83, 0xda, 0xee, 0x30, 0x8e, 0x87, 0x23, 0xdc, 0xf2, 0x93, 0xa8,
+	0xe5, 0x13, 0x12, 0xa7, 0x7e, 0x1a, 0xc5, 0x84, 0xc9, 0x08, 0x7b, 0x03, 0xd6, 0xcf, 0x19, 0xa6,
+	0x6f, 0x22, 0x96, 0xba, 0xf8, 0xc3, 0x18, 0xb3, 0xd4, 0xfe, 0xa2, 0xc0, 0x06, 0xdf, 0x3b, 0xa2,
+	0xd8, 0x4f, 0x71, 0xb6, 0x8b, 0x6a, 0x50, 0xe2, 0x60, 0xe2, 0x5f, 0x61, 0x4b, 0xa9, 0x2b, 0x0d,
+	0xc3, 0x9d, 0xd9, 0xdc, 0x97, 0xf8, 0x8c, 0x4d, 0x62, 0x1a, 0x5a, 0xaa, 0xf4, 0x4d, 0x6d, 0x54,
+	0x05, 0x8d, 0xc4, 0xde, 0x70, 0x62, 0xad, 0xd6, 0x95, 0x46, 0xc9, 0x2d, 0x90, 0xb8, 0x3b, 0x41,
+	0xdb, 0x50, 0x7c, 0x1f, 0xb3, 0xd4, 0x8b, 0x42, 0xab, 0x50, 0x57, 0x1a, 0x6b, 0xae, 0xce, 0xcd,
+	0x93, 0x10, 0xed, 0x40, 0x29, 0x62, 0x9e, 0x1f, 0x5e, 0x45, 0xc4, 0xd2, 0x44, 0x42, 0x31, 0x62,
+	0x1d, 0x6e, 0xda, 0xdf, 0x56, 0x65, 0x59, 0xe7, 0x49, 0xf8, 0x0f, 0xca, 0x3a, 0x00, 0x7d, 0x38,
+	0x49, 0x28, 0xbe, 0x14, 0x75, 0xfd, 0xd7, 0xde, 0x6d, 0x26, 0x83, 0xe6, 0x1f, 0xf8, 0x66, 0xf7,
+	0xe2, 0x94, 0xe2, 0x4b, 0x37, 0x8b, 0xbd, 0xbd, 0xee, 0x0e, 0x94, 0x19, 0x6f, 0x6c, 0xe0, 0x09,
+	0xa6, 0x26, 0x98, 0xf5, 0xc5, 0xcc, 0xbe, 0x08, 0x14, 0x5c, 0x60, 0xb3, 0x35, 0x7a, 0x01, 0x20,
+	0xbe, 0x5b, 0x12, 0x74, 0x41, 0xb8, 0xb7, 0x98, 0x20, 0x1a, 0x22, 0x00, 0x86, 0x3f, 0x5d, 0xda,
+	0x0f, 0x41, 0x97, 0xd5, 0x22, 0x00, 0xdd, 0xe9, 0x9d, 0xba, 0x2f, 0x5f, 0x99, 0x2b, 0xa8, 0x04,
+	0x05, 0xa7, 0xd7, 0xbd, 0x30, 0x15, 0xa4, 0x83, 0xda, 0xbd, 0x30, 0x55, 0xfb, 0x19, 0xc0, 0xbc,
+	0x02, 0x64, 0x42, 0x45, 0xc6, 0xf6, 0xcf, 0x3a, 0x67, 0x27, 0x47, 0xe6, 0x0a, 0xaa, 0x40, 0xc9,
+	0xe9, 0x65, 0x96, 0xc2, 0x59, 0xd9, 0x5a, 0xb5, 0x0f, 0xc0, 0x98, 0x9d, 0x8c, 0xd6, 0xa1, 0x2c,
+	0x13, 0x3b, 0xc7, 0x6f, 0x4f, 0x1c, 0x73, 0x05, 0x95, 0xa1, 0xe8, 0xf4, 0xa4, 0xa1, 0x20, 0x03,
+	0x34, 0xb9, 0x54, 0xed, 0x96, 0xbc, 0xb6, 0x63, 0x3c, 0xc2, 0x4b, 0x5d, 0x9b, 0xdd, 0x04, 0x93,
+	0x27, 0xb8, 0x98, 0xe0, 0xc9, 0x32, 0xf1, 0x6d, 0xd8, 0xe4, 0xf1, 0x5d, 0x4c, 0x8e, 0x62, 0x72,
+	0x19, 0x0d, 0x97, 0xc9, 0xf9, 0xaa, 0x42, 0x45, 0x1e, 0xc2, 0x92, 0x98, 0x30, 0x8c, 0x1e, 0x81,
+	0xc6, 0x9d, 0xcc, 0x52, 0xea, 0xab, 0x8d, 0x72, 0x7b, 0x6b, 0xda, 0xf8, 0x69, 0x80, 0x34, 0x64,
+	0x4c, 0xed, 0xa7, 0x02, 0x05, 0x6e, 0xff, 0x75, 0xfa, 0x1e, 0xc3, 0x26, 0xc3, 0xf4, 0x1a, 0x53,
+	0x8f, 0x61, 0x1a, 0xf9, 0x23, 0x8f, 0x8c, 0xaf, 0x06, 0x98, 0x66, 0x93, 0x88, 0xa4, 0xaf, 0x2f,
+	0x5c, 0x8e, 0xf0, 0x20, 0x04, 0x85, 0x00, 0xd3, 0x54, 0x4c, 0xa4, 0xe1, 0x8a, 0x35, 0xda, 0x03,
+	0x08, 0x84, 0x0e, 0x43, 0xcf, 0x4f, 0xc5, 0xd0, 0x19, 0xae, 0x91, 0xed, 0x74, 0x52, 0xb4, 0x05,
+	0x7a, 0x94, 0x78, 0x04, 0xa7, 0x62, 0xe4, 0x0c, 0x57, 0x8b, 0x12, 0x07, 0xa7, 0x73, 0xd1, 0xe9,
+	0x8b, 0x45, 0x57, 0xbc, 0x55, 0x74, 0xa5, 0xbc, 0xe8, 0x9e, 0xc3, 0xd6, 0x8d, 0xde, 0x66, 0xfd,
+	0x7a, 0x00, 0x6b, 0xc1, 0x28, 0xc2, 0x24, 0xf5, 0x02, 0xe1, 0xc8, 0x3e, 0xbf, 0x22, 0x37, 0x65,
+	0x70, 0xfb, 0x53, 0x01, 0xca, 0x3c, 0xbd, 0x8f, 0xe9, 0x75, 0x14, 0x60, 0xf4, 0x1a, 0x0a, 0xfc,
+	0xa1, 0x41, 0xd5, 0x69, 0x77, 0x7f, 0x7b, 0x76, 0x6a, 0xe6, 0xcd, 0x96, 0xdb, 0x3b, 0x1f, 0xbf,
+	0xff, 0xf8, 0xac, 0x56, 0xd1, 0x86, 0x78, 0xbb, 0xae, 0x9f, 0xb4, 0x78, 0x6f, 0x5b, 0x23, 0x4e,
+	0x78, 0x07, 0xba, 0x7c, 0x9e, 0xd0, 0xec, 0xa6, 0x72, 0xcf, 0xd5, 0x02, 0xda, 0x5d, 0x41, 0xb3,
+	0xec, 0x6a, 0x8e, 0x26, 0x5b, 0x79, 0xa8, 0xec, 0x73, 0xa4, 0x54, 0xd9, 0x1c, 0x99, 0x53, 0xdd,
+	0xd2, 0xc8, 0xb1, 0xc8, 0xca, 0x90, 0x72, 0xec, 0xe7, 0xc8, 0x9c, 0x0c, 0x96, 0x46, 0x86, 0x22,
+	0x8b, 0x23, 0x1d, 0xd0, 0x84, 0x30, 0xd0, 0xe6, 0x3c, 0x75, 0xae, 0x93, 0x05, 0xc0, 0x3d, 0x01,
+	0xdc, 0xb6, 0x51, 0x0e, 0x48, 0x79, 0x12, 0xe7, 0x05, 0x60, 0xcc, 0x2e, 0x17, 0x59, 0xd3, 0xec,
+	0x9b, 0x5a, 0xaa, 0xed, 0x2c, 0xf0, 0x64, 0x07, 0xdc, 0x17, 0x07, 0xdc, 0xb1, 0xff, 0xcf, 0x1d,
+	0x30, 0xc4, 0x44, 0x0e, 0xc6, 0xa1, 0xb2, 0x3f, 0xd0, 0xc5, 0xbf, 0xe6, 0xe9, 0xaf, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x89, 0x27, 0x01, 0x2f, 0x9b, 0x06, 0x00, 0x00,
 }

api/pb/user.proto

@@ -11,7 +11,7 @@ message UserListRequest {
 message UserCreateRequest {
   string username = 1;
   string password = 2;
-  bool no_gW = 3;
+  bool no_gw = 3;
   uint32 host_id = 4;
   bool is_admin = 5;
 }

api/rpc.go

@@ -92,7 +92,7 @@ func (s *UserService) List(ctx context.Context, req *pb.UserListRequest) (*pb.Us
 func (s *UserService) Create(ctx context.Context, req *pb.UserCreateRequest) (*pb.UserResponse, error) {
 	logrus.Debugf("rpc call: user create: %s", req.Username)
 	var ut []*pb.UserResponse_User
-	user, err := ovpm.CreateNewUser(req.Username, req.Password, req.NoGW, req.HostId, req.IsAdmin)
+	user, err := ovpm.CreateNewUser(req.Username, req.Password, req.NoGw, req.HostId, req.IsAdmin)
 	if err != nil {
 		return nil, err
 	}

cmd/ovpm/user.go

@@ -122,7 +122,7 @@ var userCreateCommand = cli.Command{
 		userSvc := pb.NewUserServiceClient(conn)
 
 		response, err := userSvc.Create(context.Background(),
-			&pb.UserCreateRequest{Username: username, Password: password, NoGW: noGW, HostId: hostid, IsAdmin: admin},
+			&pb.UserCreateRequest{Username: username, Password: password, NoGw: noGW, HostId: hostid, IsAdmin: admin},
 		)
 		if err != nil {
 			logrus.Errorf("user can not be created '%s': %v", username, err)

cmd/ovpmd/main.go

@@ -37,7 +37,11 @@ func main() {
 		},
 		cli.StringFlag{
 			Name:  "port",
-			Usage: "port number for daemon to listen on",
+			Usage: "port number for gRPC API daemon",
+		},
+		cli.StringFlag{
+			Name:  "web-port",
+			Usage: "port number for the REST API daemon",
 		},
 	}
 	app.Before = func(c *cli.Context) error {
@@ -57,7 +61,13 @@ func main() {
 		if port == "" {
 			port = "9090"
 		}
-		s := newServer(port)
+
+		webPort := c.String("web-port")
+		if webPort == "" {
+			webPort = "8080"
+		}
+
+		s := newServer(port, webPort)
 		s.start()
 		s.waitForInterrupt()
 		s.stop()
@@ -77,7 +87,7 @@ type server struct {
 	done       chan bool
 }
 
-func newServer(port string) *server {
+func newServer(port, webPort string) *server {
 	sigs := make(chan os.Signal, 1)
 	done := make(chan bool, 1)
 
@@ -110,7 +120,7 @@ func newServer(port string) *server {
 			grpcServer: rpcServer,
 			restServer: restServer,
 			restCancel: context.CancelFunc(restCancel),
-			restPort:   increasePort(port),
+			restPort:   webPort,
 			signal:     sigs,
 			done:       done,
 			grpcPort:   port,

template/user.swagger.json

@@ -231,7 +231,7 @@
         "password": {
           "type": "string"
         },
-        "no_gW": {
+        "no_gw": {
           "type": "boolean",
           "format": "boolean"
         },

vpn.go

@@ -50,6 +50,7 @@ type dbServerModel struct {
 // Server represents VPN server.
 type Server struct {
 	dbServerModel
+	webPort string
 }
 
 // CheckSerial takes a serial number and checks it against the current server's serial number.
@@ -816,7 +817,11 @@ func emitIptables() error {
 			if err != nil {
 				return err
 			}
+
+			// Find associated users and emit iptables configs for the users
+			// regarding the network's type and attributes.
 			for _, user := range users {
+				// Find out if the user is associated or not.
 				var found bool
 				for _, auser := range associatedUsernames {
 					if user.Username == auser {

webui/ovpm/app/components/Dashboard/AdminDashboard/UserEdit/index.jsx

@@ -17,7 +17,7 @@ export default class UserEdit extends React.Component {
             password: "",
             staticIP: this.props.staticIP ? this.props.staticIP : "",
             ipAllocationMethod: this.props.ipAllocationMethod ? this.props.ipAllocationMethod : "dynamic",
-            pushGW: this.props.pushGW ? this.props.pushGW : false,
+            pushGW: this.props.pushGW != undefined ? this.props.pushGW : true,
             isAdmin: this.props.isAdmin ? this.props.isAdmin : false,
         }
 

webui/ovpm/app/components/Dashboard/AdminDashboard/index.jsx

@@ -197,7 +197,8 @@ export default class AdminDashboard extends React.Component {
             host_id: 0, // handle this host_id problem
             is_admin: user.isAdmin,
         }
-        userObj.gwpref = user.pushGW ? "GW" : "NOGW"
+        console.log("USER", user)
+        userObj.no_gw = !user.pushGW
         userObj.admin_pref = user.isAdmin ? "ADMIN" : "NOADMIN"
         userObj.host_id = user.ipAllocationMethod === "static" ? dot2num(user.staticIP) : 0
         userObj.static_pref = user.ipAllocationMethod === "static" ? "STATIC" : "NOSTATIC"

webui/ovpm/package-lock.json

@@ -5808,14 +5808,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-template": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/string-template/-/string-template-1.0.0.tgz",
@@ -5854,6 +5846,14 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",