Updated profiles for network

profile.go

@@ -32,6 +32,8 @@ type Profile struct {
 	XServer XServerConf
 	// List of environment variables
 	Environment []EnvVar
+	// Networking
+	Networking NetworkProfile
 }
 
 type XServerConf struct {
@@ -59,6 +61,19 @@ type EnvVar struct {
 	Value string
 }
 
+// Container network definition
+type NetworkProfile struct {
+	// One of empty, host, bridge
+	Nettype string
+
+	// Name of the bridge to attach to
+	//Bridge string
+
+	// List of Sockets we want to attach to the jail
+	//  Applies to Nettype: bridge and empty only
+	//Sockets []nsnat.ConfigSocket
+}
+
 const defaultProfileDirectory = "/var/lib/oz/cells.d"
 
 var loadedProfiles []*Profile

profiles/evince.json

@@ -5,7 +5,7 @@
 	, "enable_tray": true
 	, "tray_icon":"/usr/share/icons/hicolor/48x48/apps/evince.png"
 }
-, "network":{
+, "networking":{
 	"nettype":"empty"
 }
 , "whitelist": [

profiles/gajim.json

@@ -6,15 +6,10 @@
 	, "tray_icon":"/usr/share/icons/gnome-colors-common/scalable/apps/gajim.svg"
 	, "disable_audio":true
 }
-, "network":{
+, "networking":{
 	"nettype":"empty"
 	, "sockets": [
 		{"nettype":"client", "proto":"tcp", "port":9050}
-		, {"nettype":"client", "destination": "xmpp.lalonde.me", "proto":"tcp", "port":5222}
-		, {"nettype":"client", "destination": "xmpp.lalonde.me", "proto":"tcp", "port":5269}
-		, {"nettype":"client", "destination": "xmpp.lalonde.me", "proto":"tcp", "port":5000}
-		, {"nettype":"client", "destination": "xmpp.lalonde.me", "proto":"tcp", "port":5280}
-		, {"nettype":"client", "destination": "xmpp.lalonde.me", "proto":"tcp", "port":5281}
 	]
 }
 , "whitelist": [

profiles/icedove.json

@@ -6,7 +6,7 @@
 	, "tray_icon": "/usr/share/icons/hicolor/scalable/apps/icedove.svg"
 	, "disable_audio": true
 }
-, "network":{
+, "networking":{
 	"nettype":"bridge"
 	, "sockets": [
 		{"nettype":"client", "proto":"tcp", "port":9050}

profiles/iceweasel.json

@@ -5,7 +5,7 @@
 	, "enable_tray": true
 	, "tray_icon":"/usr/share/icons/hicolor/scalable/apps/iceweasel.svg"
 }
-, "network":{
+, "networking":{
 	"nettype":"bridge"
 	, "sockets": [
 		{"nettype":"client", "proto":"tcp", "port":9050}

profiles/liferea.json

@@ -7,7 +7,7 @@
 	, "tray_icon":"/usr/share/icons/hicolor/scalable/apps/liferea.svg"
 	, "_tray_icon":"/usr/share/icons/gnome-colors-common/scalable/apps/liferea.svg"
 }
-, "network":{
+, "networking":{
 	"nettype":"bridge"
 	, "sockets": [
 		{"nettype":"client", "proto":"tcp", "port":9050}

profiles/pidgin.json

@@ -5,7 +5,7 @@
 	, "enable_tray": true
 	, "tray_icon":"/usr/share/icons/gnome-colors-common/scalable/apps/pidgin-menu.svg"
 }
-, "network":{
+, "networking":{
 	"nettype":"bridge"
 }
 , "whitelist": [

profiles/pond.json

@@ -7,7 +7,7 @@
 	, "window_icon":"/usr/share/icons/gnome-colors-common/scalable/apps/office-mail.svg"
 	, "disable_audio":true
 }
-, "network":{
+, "networking":{
 	"nettype":"empty"
 	, "sockets": [
 		{"nettype":"client", "proto":"tcp", "port":9050}

profiles/torbrowser-launcher.json

@@ -8,7 +8,7 @@
 	, "disable_clipboard": false
 	, "tray_icon":"/usr/share/pixmaps/torbrowser80.xpm"
 }
-, "network":{
+, "networking":{
 	"nettype":"empty"
 	, "sockets": [
 		{"nettype":"client", "proto":"tcp", "port":9050}

profiles/xchat.json

@@ -6,7 +6,7 @@
 	, "tray_icon": "/usr/share/icons/gnome-colors-common/scalable/apps/xchat.svg"
 	, "disable_audio": true
 }
-, "network":{
+, "networking":{
 	"nettype":"empty"
 	, "sockets": [
 		{"nettype":"client", "destination": "10.10.0.90", "proto":"tcp", "port":57000}