Basic example configurations for the new system

11 files changed, 28 insertions, 53 deletions

diff --git a/examples/complete.example b/examples/complete.example
deleted file mode 100644
index a2587f2..0000000
--- a/examples/complete.example
+++ /dev/null
@@ -1,47 +0,0 @@
-CONNECTION="wireless"
-DESCRIPTION="Very verbose complete wireless example"
-
-INTERFACE=eth0
-HOSTNAME=myhost
-
-# Interface Settings (use IP="dhcp" for DHCP)
-IP="static"
-IFOPTS="192.168.0.2 netmask 255.255.255.0 broadcast 192.168.0.255"
-GATEWAY=192.168.0.1
-
-# DHCP Example
-#IP=dhcp
-#DHCP_TIMEOUT=20 # Default is 10.
-#DHCP_OPTIONS="" # Extra arguments for dhcpcd
-
-# DNS Settings (optional)
-DOMAIN=localdomain
-DNS1=192.168.0.1
-DNS2=
-SEARCH=
-
-# Standard Wireless Settings
-ESSID=MyNetwork
-SECURITY=wpa # One of wep, wpa, wpa-config, none
-KEY="SomePasskey"
-
-# Scans to see if network is available before connecting (reccomended)
-SCAN="YES"
-
-# Time to wait to connect to a network. Default 15.
-TIMEOUT=10
-
-# Pass *custom* options to iwconfig. Usually not needed (optional)
-IWOPTS="mode managed essid $ESSID channel 6 key restricted $KEY"
-
-# Any extra arguments for wpa_supplicant
-WPA_OPTS=
-
-# For SECURITY='wpa-config' only - filename of a wpa-supplicant config
-WPA_CONF=
-
-# Commands to run at various stages of configuration
-PRE_UP=
-POST_UP=
-PRE_DOWN=
-POST_DOWN="some command"
diff --git a/examples/deprecated/ethernet-static.example b/examples/deprecated/ethernet-static.example
new file mode 100644
index 0000000..b50cf36
--- /dev/null
+++ b/examples/deprecated/ethernet-static.example
@@ -0,0 +1,8 @@
+CONNECTION="ethernet"
+DESCRIPTION="A less basic ethernet profile, using static configuration"
+INTERFACE=eth0
+IP="static"
+IFOPTS="192.168.1.23 netmask 255.255.255.0 broadcast 192.168.1.255"
+GATEWAY="192.168.1.1"
+DNS1=192.168.1.1
+DNS2=dns1.dreamhost.com
diff --git a/examples/ethernet.example b/examples/deprecated/ethernet.example
index 2db6072..2db6072 100644
--- a/examples/ethernet.example
+++ b/examples/deprecated/ethernet.example
diff --git a/examples/wep-static.example b/examples/deprecated/wep-static.example
index 4474ba7..4474ba7 100644
--- a/examples/wep-static.example
+++ b/examples/deprecated/wep-static.example
diff --git a/examples/wep-string-key.example b/examples/deprecated/wep-string-key.example
index 3118658..3118658 100644
--- a/examples/wep-string-key.example
+++ b/examples/deprecated/wep-string-key.example
diff --git a/examples/wep.example b/examples/deprecated/wep.example
index 4dad0e1..4dad0e1 100644
--- a/examples/wep.example
+++ b/examples/deprecated/wep.example
diff --git a/examples/wpa.example b/examples/deprecated/wpa.example
index f165945..f165945 100644
--- a/examples/wpa.example
+++ b/examples/deprecated/wpa.example
diff --git a/examples/ethernet-dhcp.example b/examples/ethernet-dhcp.example
new file mode 100644
index 0000000..6f80a9e
--- /dev/null
+++ b/examples/ethernet-dhcp.example
@@ -0,0 +1,3 @@
+CONNECTION="ethernet-iproute"
+INTERFACE="eth0"
+IP="dhcp"
diff --git a/examples/ethernet-iproute.example b/examples/ethernet-iproute.example
new file mode 100755
index 0000000..a368707
--- /dev/null
+++ b/examples/ethernet-iproute.example
@@ -0,0 +1,6 @@
+CONNECTION="ethernet-iproute"
+INTERFACE="eth0"
+IP="static"
+# Any valid iproute command can be placed in this array
+IPCFG=("addr add dev eth0 192.168.1.23/24 brd +" "route add default via 192.168.1.1") 
+DNS=("192.168.1.1")
diff --git a/examples/ethernet-static.example b/examples/ethernet-static.example
index b50cf36..ad0c9b4 100644
--- a/examples/ethernet-static.example
+++ b/examples/ethernet-static.example
@@ -1,8 +1,6 @@
-CONNECTION="ethernet"
-DESCRIPTION="A less basic ethernet profile, using static configuration"
-INTERFACE=eth0
+CONNECTION="ethernet-iproute"
+INTERFACE="eth0"
 IP="static"
-IFOPTS="192.168.1.23 netmask 255.255.255.0 broadcast 192.168.1.255"
+ADDR="192.168.1.23"
 GATEWAY="192.168.1.1"
-DNS1=192.168.1.1
-DNS2=dns1.dreamhost.com
+DNS=("192.168.1.1")
diff --git a/examples/wireless.example b/examples/wireless.example
new file mode 100644
index 0000000..9e92a63
--- /dev/null
+++ b/examples/wireless.example
@@ -0,0 +1,7 @@
+CONNECTION="wireless-new"
+INTERFACE=ipw0
+SECURITY="yes"
+ESSID="Your ESSID"
+KEY="Your Key"
+# Below can be any valid ethernet option. See ethernet-*.example
+IP="dhcp"