From 27c11787d7c58b02f12d7afd476ea66abfeecaaf Mon Sep 17 00:00:00 2001 From: Jouke Witteveen Date: Fri, 28 Dec 2012 02:43:13 +0100 Subject: Forking netcfg to netctl (2/2) This commit contains the refactoring and rewriting of code. --- docs/examples/bonding | 15 ++++++-------- docs/examples/bridge | 14 ++++++------- docs/examples/ethernet-dhcp | 12 +++++------ docs/examples/ethernet-iproute | 10 +++++----- docs/examples/ethernet-static | 22 ++++++++++----------- docs/examples/pppoe | 34 ++++++++++++++++---------------- docs/examples/tunnel-he-ipv6 | 19 +++++++++--------- docs/examples/tuntap | 15 +++++++------- docs/examples/vlan-dhcp | 11 ++++++----- docs/examples/vlan-static | 22 ++++++++++----------- docs/examples/wireless-open | 10 +++++----- docs/examples/wireless-wep | 17 ++++++++-------- docs/examples/wireless-wep-string-key | 12 +++++------ docs/examples/wireless-wpa | 16 +++++++-------- docs/examples/wireless-wpa-config | 12 +++++------ docs/examples/wireless-wpa-configsection | 31 +++++++++++++++-------------- docs/examples/wireless-wpa-static | 18 ++++++++--------- 17 files changed, 144 insertions(+), 146 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/bonding b/docs/examples/bonding index e8d4a7f..090892d 100644 --- a/docs/examples/bonding +++ b/docs/examples/bonding @@ -1,9 +1,6 @@ -CONNECTION="bond" -DESCRIPTION='Bond Interface' -INTERFACE='bond0' -IP='static' -ADDR="10.0.0.1" -NETMASK="255.0.0.0" -SLAVE_INTERFACES=("eth0" "eth2") -SKIPNOCARRIER="yes" - +Description='Bond Interface' +Interface='bond0' +Connection=bond +BindsToInterfaces=(eth0 eth2) +IP=static +Address="10.0.0.1/8" diff --git a/docs/examples/bridge b/docs/examples/bridge index bd422fa..f8d2915 100644 --- a/docs/examples/bridge +++ b/docs/examples/bridge @@ -1,9 +1,9 @@ -INTERFACE="br0" -CONNECTION="bridge" -DESCRIPTION="Example Bridge connection" -BRIDGE_INTERFACES="eth0 eth1 tap0" -IP="dhcp" +Description="Example Bridge connection" +Interface=br0 +Connection=bridge +BindsToInterfaces=(eth0 eth1 tap0) +IP=dhcp ## sets forward delay time -#FWD_DELAY=0 +#FWDDelay=0 ## sets max age of hello message -#MAX_AGE=10 +#MaxAge=10 diff --git a/docs/examples/ethernet-dhcp b/docs/examples/ethernet-dhcp index 0719632..5866238 100644 --- a/docs/examples/ethernet-dhcp +++ b/docs/examples/ethernet-dhcp @@ -1,9 +1,9 @@ -CONNECTION='ethernet' -DESCRIPTION='A basic dhcp ethernet connection using iproute' -INTERFACE='eth0' -IP='dhcp' +Description='A basic dhcp ethernet connection using iproute' +Interface=eth0 +Connection=ethernet +IP=dhcp ## for DHCPv6 -#IP6='dhcp' +#IP6=dhcp ## for IPv6 autoconfiguration -#IP6='stateless' +#IP6=stateless diff --git a/docs/examples/ethernet-iproute b/docs/examples/ethernet-iproute index d22dd17..972f5bb 100644 --- a/docs/examples/ethernet-iproute +++ b/docs/examples/ethernet-iproute @@ -1,7 +1,7 @@ -CONNECTION='ethernet' -DESCRIPTION='A more versatile static ethernet connection using iproute' -INTERFACE='eth0' -IP='static' +Description='A more versatile static ethernet connection using iproute' +Interface=eth0 +Connection=ethernet +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') +IPCustom=('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/docs/examples/ethernet-static b/docs/examples/ethernet-static index ea88bde..0d6b5a2 100644 --- a/docs/examples/ethernet-static +++ b/docs/examples/ethernet-static @@ -1,17 +1,17 @@ -CONNECTION='ethernet' -DESCRIPTION='A basic static ethernet connection using iproute' -INTERFACE='eth0' -IP='static' -ADDR='192.168.1.23' -#ROUTES=('192.168.0.0/24 via 192.168.1.2') -GATEWAY='192.168.1.1' +Description='A basic static ethernet connection using iproute' +Interface=eth0 +Connection=ethernet +IP=static +Address='192.168.1.23' +#Routes=('192.168.0.0/24 via 192.168.1.2') +Gateway='192.168.1.1' DNS=('192.168.1.1') ## For IPv6 autoconfiguration #IP6=stateless ## For IPv6 static address configuration -#IP6='static' -#ADDR6=('1234:5678:9abc:def::1/64' '1234:3456::123/96') -#ROUTES6=('abcd::1234') -#GATEWAY6='1234:0:123::abcd' +#IP6=static +#Address6=('1234:5678:9abc:def::1/64' '1234:3456::123/96') +#Routes6=('abcd::1234') +#Gateway6='1234:0:123::abcd' diff --git a/docs/examples/pppoe b/docs/examples/pppoe index c11d125..74cc9ff 100644 --- a/docs/examples/pppoe +++ b/docs/examples/pppoe @@ -1,33 +1,33 @@ -CONNECTION='pppoe' -DESCRIPTION='Example PPPoE connection' -INTERFACE='eth0' -USER='example@yourprovider.com' -PASSWORD='very secret' +Description='Example PPPoE connection' +Interface=eth0 +Connection=pppoe +User='example@yourprovider.com' +Password='very secret' # Always keep a connection established -CONNECTION_MODE='persist' +ConnectionMode='persist' # Establish connection on demand -#CONNECTION_MODE='demand' -#IDLE_TIMEOUT=300 +#ConnectionMode='demand' +#IdleTimeout=300 # Use default route provided by the peer (default: true) -#DEFAULTROUTE=1 +#DefaultRoute=true # Use DNS provided by the peer (default: true) -#USEPEERDNS=1 +#UsePeerDNS=true # Override default LCP parameters from /etc/ppp/options -#LCP_ECHO_INTERVAL=15 -#LCP_ECHO_FAILURE=10 +#LCPEchoInterval=15 +#LCPEchoFailure=10 # PPPoE options - experts only # # PPPoE service name -#PPPOE_SERVICE='' +#PPPoEService='' # PPPoE access concentrator name -#PPPOE_AC='' +#PPPoEAC='' # Attach to existing session (sessid:macaddr) -#PPPOE_SESSION='' +#PPPoESession='' # Only connect to specified MAC address -#PPPOE_MAC='' +#PPPoEMAC='' # Enable IPv6 support -#PPPOE_IP6='yes' +#PPPoEIP6=yes diff --git a/docs/examples/tunnel-he-ipv6 b/docs/examples/tunnel-he-ipv6 index 81b18ad..2a19406 100644 --- a/docs/examples/tunnel-he-ipv6 +++ b/docs/examples/tunnel-he-ipv6 @@ -1,11 +1,10 @@ -CONNECTION='tunnel' -DESCRIPTION='An example ipv6 tunnel with Hurricane Electric' +Description='An example ipv6 tunnel with Hurricane Electric' +Interface=he-ipv6 +Connection=tunnel +Mode='sit' +Remote='216.66.80.26' +#Local='172.16.0.1' -INTERFACE='he-ipv6' -MODE='sit' -REMOTE='216.66.80.26' -#LOCAL='172.16.0.1' - -IP6='static' -ADDR6='2001:470:1f08:d87::2/64' -ROUTES6=('::/0') +IP6=static +Address6='2001:470:1f08:d87::2/64' +Routes6=('::/0') diff --git a/docs/examples/tuntap b/docs/examples/tuntap index 1563520..8ce78ac 100644 --- a/docs/examples/tuntap +++ b/docs/examples/tuntap @@ -1,11 +1,10 @@ -INTERFACE='tun0' -CONNECTION='tuntap' -MODE='tun' -USER='nobody' -GROUP='nobody' +Interface=tun0 +Connection=tuntap +Mode='tun' +User='nobody' +Group='nobody' ## Example IP configuration -#IP='static' -#SKIPNOCARRIER='yes' -#ADDR='10.10.1.2' +#IP=static +#Address='10.10.1.2' diff --git a/docs/examples/vlan-dhcp b/docs/examples/vlan-dhcp index 8c6ad23..c412618 100644 --- a/docs/examples/vlan-dhcp +++ b/docs/examples/vlan-dhcp @@ -1,5 +1,6 @@ -INTERFACE="eth0.55" -VLAN_PHYS_DEV="eth0" -VLAN_ID="55" -CONNECTION="vlan" -IP="dhcp" +Interface=eth0.55 +Connection=vlan +# The variable name is plural, but needs precisely one interface +BindsToInterfaces=eth0 +VLANID=55 +IP=dhcp diff --git a/docs/examples/vlan-static b/docs/examples/vlan-static index b7b9753..f9e1ae5 100644 --- a/docs/examples/vlan-static +++ b/docs/examples/vlan-static @@ -1,12 +1,12 @@ -INTERFACE="eth0.11" -VLAN_PHYS_DEV="eth0" -VLAN_ID="11" -CONNECTION="vlan" -IP="static" -ADDR="192.168.0.100" -NETMASK="255.255.255.0" -GATEWAY="192.168.0.1" +Interface=eth0.11 +Connection=vlan +# The variable name is plural, but needs precisely one interface +BindsToInterfaces=eth0 +VLANID=11 +IP=static +Address="192.168.0.100/24" +Gateway="192.168.0.1" DNS=("192.168.0.2") -HOSTNAME="myhost" -DOMAIN="mydomain.com" -SEARCH="mydomain.com" +Hostname="myhost" +DNSDomain="mydomain.com" +DNSSearch="mydomain.com" diff --git a/docs/examples/wireless-open b/docs/examples/wireless-open index db8d6ef..f4bf9bb 100644 --- a/docs/examples/wireless-open +++ b/docs/examples/wireless-open @@ -1,8 +1,8 @@ -CONNECTION='wireless' -DESCRIPTION='A simple opened wireless connection' -INTERFACE='wlan0' -SECURITY='none' +Description='A simple opened wireless connection' +Interface=wlan0 +Connection=wireless +Security=none ESSID='MyNetwork' IP='dhcp' # Uncomment this if your ssid is hidden -#HIDDEN=yes +#Hidden=yes diff --git a/docs/examples/wireless-wep b/docs/examples/wireless-wep index b16f65e..479b8a3 100644 --- a/docs/examples/wireless-wep +++ b/docs/examples/wireless-wep @@ -1,11 +1,12 @@ -CONNECTION='wireless' -DESCRIPTION='A simple WEP encrypted wireless connection' -INTERFACE='wlan0' -SECURITY='wep' +Description='A simple WEP encrypted wireless connection' +Interface=wlan0 +Connection=wireless +Security=wep ESSID='MyNetwork' -KEY='1234567890' +# Prepend hexadecimal keys with \" +Key=\"1234567890abcdef IP='dhcp' # Uncomment this if your ssid is hidden -#HIDDEN=yes -## Uncomment if you are using an ad-hoc connection -#ADHOC=1 +#Hidden=yes +# Uncomment if you are using an ad-hoc connection +#AdHoc=yes diff --git a/docs/examples/wireless-wep-string-key b/docs/examples/wireless-wep-string-key index ebc4b0a..12483c0 100644 --- a/docs/examples/wireless-wep-string-key +++ b/docs/examples/wireless-wep-string-key @@ -1,9 +1,9 @@ -CONNECTION='wireless' -DESCRIPTION='A simple WEP encrypted wireless connection' -INTERFACE='wlan0' -SECURITY='wep' +Description='A simple WEP encrypted wireless connection' +Interface=wlan0 +Connection=wireless +Security=wep ESSID='MyNetwork' -KEY='s:Wireless Key' +Key='Wireless Key' IP='dhcp' # Uncomment this if your ssid is hidden -#HIDDEN=yes +#Hidden=yes diff --git a/docs/examples/wireless-wpa b/docs/examples/wireless-wpa index e2511f3..16d17e9 100644 --- a/docs/examples/wireless-wpa +++ b/docs/examples/wireless-wpa @@ -1,14 +1,14 @@ -CONNECTION='wireless' -DESCRIPTION='A simple WPA encrypted wireless connection' -INTERFACE='wlan0' -SECURITY='wpa' +Description='A simple WPA encrypted wireless connection' +Interface=wlan0 +Connection=wireless +Security=wpa ESSID='MyNetwork' -## Uncomment if the supplied ESSID is hexadecimal -#ESSID_TYPE='hex' -KEY='WirelessKey' +# Prepend hexadecimal keys with \" +# If your key starts with ", write it as '""""' +Key='WirelessKey' IP='dhcp' # Uncomment this if your ssid is hidden -#HIDDEN=yes +#Hidden=yes diff --git a/docs/examples/wireless-wpa-config b/docs/examples/wireless-wpa-config index 955d845..e598dce 100644 --- a/docs/examples/wireless-wpa-config +++ b/docs/examples/wireless-wpa-config @@ -1,8 +1,8 @@ -CONNECTION='wireless' -DESCRIPTION='A wpa_supplicant configuration based wireless connection' -INTERFACE='wlan0' -SECURITY='wpa-config' -WPA_CONF='/etc/wpa_supplicant.conf' +Description='A wpa_supplicant configuration based wireless connection' +Interface=wlan0 +Connection=wireless +Security=wpa-config +WPAConfigFile='/etc/wpa_supplicant.conf' IP='dhcp' # Uncomment this if your ssid is hidden -#HIDDEN=yes +#Hidden=yes diff --git a/docs/examples/wireless-wpa-configsection b/docs/examples/wireless-wpa-configsection index d6cc8ad..dde9ccd 100644 --- a/docs/examples/wireless-wpa-configsection +++ b/docs/examples/wireless-wpa-configsection @@ -1,17 +1,18 @@ -CONNECTION='wireless' -INTERFACE=wlan0 -SECURITY='wpa-configsection' +Interface=wlan0 +Connection=wireless +Security=wpa-configsection # Uncomment this if your ssid is hidden -#HIDDEN=yes +#Hidden=yes IP='dhcp' -CONFIGSECTION=' - ssid="University" - key_mgmt=WPA-EAP - eap=TTLS - group=TKIP - pairwise=TKIP CCMP - anonymous_identity="anonymous" - identity="myusername" - password="mypassword" - priority=1 - phase2="auth=PAP"' +WPAConfigSection=( + 'ssid="University"' + 'key_mgmt=WPA-EAP' + 'eap=TTLS' + 'group=TKIP' + 'pairwise=TKIP CCMP' + 'anonymous_identity="anonymous"' + 'identity="myusername"' + 'password="mypassword"' + 'priority=1' + 'phase2="auth=PAP"' +) diff --git a/docs/examples/wireless-wpa-static b/docs/examples/wireless-wpa-static index 25da514..66b6970 100644 --- a/docs/examples/wireless-wpa-static +++ b/docs/examples/wireless-wpa-static @@ -1,12 +1,12 @@ -CONNECTION='wireless' -DESCRIPTION='A simple WPA encrypted wireless connection using a static IP' -INTERFACE='wlan0' -SECURITY='wpa' +Description='A simple WPA encrypted wireless connection using a static IP' +Interface=wlan0 +Connection=wireless +Security=wpa ESSID='MyNetwork' -KEY='WirelessKey' -IP='static' # Any other CONNECTION='ethernet' options may be used. -ADDR='192.168.1.23' -GATEWAY='192.168.1.1' +Key='WirelessKey' +IP=static +Address='192.168.1.23' +Gateway='192.168.1.1' DNS=('192.168.1.1') # Uncomment this if your ssid is hidden -#HIDDEN=yes +#Hidden=yes -- cgit v1.2.3-24-g4f1b