From 09f3a1dcea0233463a3d17546176c043151ed525 Mon Sep 17 00:00:00 2001
From: "Paul C. Buetow" <paul@buetow.org>
Date: Fri, 16 May 2014 17:54:44 +0200
Subject: syntax fix

---
 .version          |  2 +-
 README.pod        |  6 +++++-
 debian/changelog  |  8 ++++++++
 docs/fapi.1       |  8 ++++++--
 docs/fapi.txt     |  6 +++++-
 docs/synopsis.txt | 51 ---------------------------------------------------
 src/fapi          |  4 ++--
 7 files changed, 27 insertions(+), 58 deletions(-)

diff --git a/.version b/.version
index b616048..faef31a 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.6.2
+0.7.0
diff --git a/README.pod b/README.pod
index 78f819e..b5cfa9b 100644
--- a/README.pod
+++ b/README.pod
@@ -46,7 +46,7 @@ L<https://devcentral.f5.com/d/bigsuds-python-icontrol-library>
 
 Unzip it and run
 
-  sudo python setyp.py install
+  sudo python setup.py install
 
 You may also install bigsuds from the contrib dir of the fapi source tree.
 
@@ -121,6 +121,10 @@ A simple nPath service can be created as follows.
   fapi vserver myvserver.example.com:443 create PROTOCOL_TCP nPath
   fapi vserver myvserver.example.com:443 set pool foopool
 
+  # Restrict the vserver to a specific VLAN (IMPORTANT! security
+  # hole otherwise!)
+  fapi vserver myvserver.example.com:443 set vlan VLANNAME
+
   # Put the VirtualAddress of the vserver into a specific traffic group
   fapi vip myserver.example.com set tgroup some-traffic-group
 
diff --git a/debian/changelog b/debian/changelog
index a56eda1..b8812bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fapi (0.7.0) stable; urgency=low
+
+  * Can also set and get the vlan of a vserver
+  * Can also set SNAT to automap
+  * Small updates in the documentation
+
+ -- Paul Buetow <paul.buetow@1und1.de>  Fri, 16 May 2014 17:52:31 +0200
+
 fapi (0.6.2) stable; urgency=low
 
   * Some more PEP8
diff --git a/docs/fapi.1 b/docs/fapi.1
index a5a8ec8..1dc317f 100644
--- a/docs/fapi.1
+++ b/docs/fapi.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FAPI 1"
-.TH FAPI 1 "2014-05-15" "fapi 0.6.2" "User Commands"
+.TH FAPI 1 "2014-05-16" "fapi 0.7.0" "User Commands"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -179,7 +179,7 @@ https://devcentral.f5.com/d/bigsuds\-python\-icontrol\-library <https://devcentr
 Unzip it and run
 .PP
 .Vb 1
-\&  sudo python setyp.py install
+\&  sudo python setup.py install
 .Ve
 .PP
 You may also install bigsuds from the contrib dir of the fapi source tree.
@@ -260,6 +260,10 @@ A simple nPath service can be created as follows.
 \&  fapi vserver myvserver.example.com:443 create PROTOCOL_TCP nPath
 \&  fapi vserver myvserver.example.com:443 set pool foopool
 \&
+\&  # Restrict the vserver to a specific VLAN (IMPORTANT! security
+\&  # hole otherwise!)
+\&  fapi vserver myvserver.example.com:443 set vlan VLANNAME
+\&
 \&  # Put the VirtualAddress of the vserver into a specific traffic group
 \&  fapi vip myserver.example.com set tgroup some\-traffic\-group
 .Ve
diff --git a/docs/fapi.txt b/docs/fapi.txt
index b96dbed..698a0cb 100644
--- a/docs/fapi.txt
+++ b/docs/fapi.txt
@@ -40,7 +40,7 @@ BIGSUDS
 
     Unzip it and run
 
-      sudo python setyp.py install
+      sudo python setup.py install
 
     You may also install bigsuds from the contrib dir of the fapi source
     tree.
@@ -109,6 +109,10 @@ EXAMPLES
       fapi vserver myvserver.example.com:443 create PROTOCOL_TCP nPath
       fapi vserver myvserver.example.com:443 set pool foopool
 
+      # Restrict the vserver to a specific VLAN (IMPORTANT! security
+      # hole otherwise!)
+      fapi vserver myvserver.example.com:443 set vlan VLANNAME
+
       # Put the VirtualAddress of the vserver into a specific traffic group
       fapi vip myserver.example.com set tgroup some-traffic-group
 
diff --git a/docs/synopsis.txt b/docs/synopsis.txt
index 3d1e7f0..4112cc6 100644
--- a/docs/synopsis.txt
+++ b/docs/synopsis.txt
@@ -22,54 +22,3 @@ optional arguments:
   -V    Print program version
   -C C  Config file
 
-
-Synopsis:
-    monitor
-    monitor NAME get desc|state
-    node
-    node NODENAME create|delete
-    node NODENAME get detail|status
-    pool
-    pool NAME add member MEMBER:PORT
-    pool NAME add monitor MONITOR
-    pool NAME create [LIST,OF,POOL,MEMBERS:PORT]
-    pool NAME delete
-    pool NAME del member MEMBER:PORT
-    pool NAME del monitors
-    pool NAME get detail|lbmethod|members|monitor|status
-    pool NAME set lbmethod LBMETHOD
-    vip
-    vip NAME create NETMASK
-    vip NAME get arp|detail|status|tgroup
-    vip NAME set arp enabled|disabled
-    vip NAME set tgroup TGROUP
-    vserver
-    vserver NAME create [protocol] [profile] [poolname] [mask]
-    vserver NAME delete
-    vserver NAME get brief|detail|status
-    vserver NAME set nat|pat disabled|enabled
-    vserver NAME set pool POOLNAME
-    vserver NAME set snat none
-The following partially needs admininstrator privileges on / and /Common
-    -f Common -b balancer.example.com selfip
-    -f Common -b balancer.example.com selfip NAME create NETMASK VLANNAME [TGROUP]
-    -f Common -b balancer.example.com selfip NAME delete
-    -f Common -b balancer.example.com selfip NAME get detail|tgroup
-    -f Common -b balancer.example.com selfip NAME set tgroup TGROUP
-    -f Common tgroup
-    -f Common tgroup NAME add ha_order DEVICE ORDER
-    -f Common tgroup NAME create
-    -f Common tgroup NAME delete
-    -f Common tgroup NAME get detail
-    -f Common tgroup NAME get ha_order
-    -f Common tgroup NAME remove all_ha_orders
-    -f Common tgroup NAME remove ha_order DEVICE ORDER
-    -f Common vlan
-    -f Common vlan NAME create tagged VLANID internal|external|...
-    -f Common vlan NAME delete
-    -f Common vlan NAME get detail
-    -f / folder
-    -f / folder NAME create|delete
-    -f / folder NAME get detail|dgroup|tgroup
-    -f / folder NAME set dgroup|tgroup DGROUP|TGROUP
-Please consult the manpage for examples.
diff --git a/src/fapi b/src/fapi
index e9ac3b1..0da4c37 100755
--- a/src/fapi
+++ b/src/fapi
@@ -92,8 +92,8 @@ class FapiBase(object):
             '    vserver NAME get brief|detail|status|vlan',
             '    vserver NAME set nat|pat disabled|enabled',
             '    vserver NAME set pool POOLNAME',
-            '    vserver NAME set snat automap|none'
-            '    vserver NAME set vlan [list,of,vlans,to,allow]',
+            '    vserver NAME set snat automap|none',
+            '    vserver NAME set vlan [list,of,vlans,to,allow]'
             + reset, 
             'The following partially needs admininstrator privileges on / and /Common', 
             style +
-- 
cgit v1.2.3