readme + headers fixes

README.md

@@ -3,19 +3,20 @@ fgpoliciestocsv
 
 Description
 -----------
-A simple script to extract policies from a FortiGate configuration file to CSV
+A collection of simple scripts to extract policies, groups and addresses from a FortiGate configuration file to CSV
 
 Features
 --------
-The script comes in two languages : Perl and Python.  
+The 'fgpoliciestocsv' script extracts policies and comes in two languages : Perl and Python.  
 The Python one is only a port of the Perl one, originally developped by Sebastian Knoop-Troullier aka 'firewallguru' and published on his blog http://firewallguru.blogspot.fr/2014/04/exporting-firewall-rules-to-csv.html
 
+Two other scripts 'fggroupstocsv' 'fgaddressestocsv' have been added to extract groups and addresses (IPv4 unicast only for now) and only come in Python.  
+
 Usage
 -----
 #### Python version  
-Pass the configuration file to the script with the -i option.  
-The processed output is available in the 'policies-out.csv' (default) or in the specified file with the -o option.  
-Two similar python script were added allowing to export also address (IPv4 unicast only for now) or groups
+Pass the configuration file to the scripts with the -i option.  
+The processed output is available in the 'policies-out.csv', 'addresses-out.csv', 'groups-out.csv' (default) or in the specified file with the -o option.  
 
 #### Perl version  
 Pass the configuration file to the script this is the only supported argument.  
@@ -94,3 +95,4 @@ Fortinet holds every rights about the FortiGate brand. I'm not affiliated nor em
 Credits
 -------
 * Sebastian Knoop-Troullier aka 'firewallguru'
+* Landry MINOZA aka 'hobgoblinsmaster'

fgaddressestocsv.py

@@ -1,23 +1,23 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# This file is part of fgaddressestocsv.
+# This file is part of fgpoliciestocsv.
 #
 # Copyright (C) 2014, Thomas Debize <tdebize at mail.com>
 # All rights reserved.
 #
-# fgaddressestocsv is free software: you can redistribute it and/or modify
+# fgpoliciestocsv is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# fgaddressestocsv is distributed in the hope that it will be useful,
+# fgpoliciestocsv is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with fgaddressestocsv.  If not, see <http://www.gnu.org/licenses/>.
+# along with fgpoliciestocsv.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
 import os

fggroupestocsv.py → fggroupstocsv.py

@@ -1,23 +1,23 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# This file is part of fggroupstocsv.
+# This file is part of fgpoliciestocsv.
 #
 # Copyright (C) 2014, Thomas Debize <tdebize at mail.com>
 # All rights reserved.
 #
-# fggroupstocsv is free software: you can redistribute it and/or modify
+# fgpoliciestocsv is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# fggroupstocsv is distributed in the hope that it will be useful,
+# fgpoliciestocsv is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with fggroupstocsv.  If not, see <http://www.gnu.org/licenses/>.
+# along with fgpoliciestocsv.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
 import os