adminsys replaced by sysadmin

pwelyn · Mar 19, 2015 · 91335c5 · 91335c5
1 parent 37ee809
commit 91335c5
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 654 deletions.
diff --git a/Linux/src/LaZagne.py b/Linux/src/LaZagne.py
@@ -18,9 +18,9 @@
 # browsers
 from softwares.browsers.mozilla import Mozilla
 from softwares.browsers.opera import Opera
-# adminsys
-from softwares.adminsys.filezilla import Filezilla
-from softwares.adminsys.env_variable import Env_variable
+# sysadmin
+from softwares.sysadmin.filezilla import Filezilla
+from softwares.sysadmin.env_variable import Env_variable
 # chats
 from softwares.chats.pidgin import Pidgin
 from softwares.chats.jitsi import Jitsi
@@ -49,9 +49,9 @@
 modules['database']['squirrel'] = Squirrel()
 modules['database']['dbvis'] = DbVisualizer()
 # SCP/SSH/FTP/FTPS clients
-modules['adminsys'] = {}
-modules['adminsys']['filezilla'] = Filezilla()
-modules['adminsys']['env'] = Env_variable()
+modules['sysadmin'] = {}
+modules['sysadmin']['filezilla'] = Filezilla()
+modules['sysadmin']['env'] = Env_variable()
 # Mails
 modules['mails'] = {}
 modules['mails']['thunderbird'] = Mozilla()
@@ -83,15 +83,15 @@ def verbosity():
 	if args['verbose']==0: level=logging.INFO
 	elif args['verbose'] >= 1: level=logging.DEBUG
 	elif args['verbose']>=2: level=logging.WARNING
-	
+
 	FORMAT = "%(message)s"
 	formatter = logging.Formatter(fmt=FORMAT)
 	stream = logging.StreamHandler()
 	stream.setFormatter(formatter)
 	root = logging.getLogger()
 	root.setLevel(level)
 	root.addHandler(stream)
-	
+
 	del args['verbose']
 
 def launch_module(b):
@@ -118,8 +118,8 @@ def runDatabaseModule():
 	launch_module(modules['database'])
 
 # SCP/SSH/FTP/FTPS clients + Environment variables
-def runAdminsysModule():
-	launch_module(modules['adminsys'])
+def runSysadminModule():
+	launch_module(modules['sysadmin'])
 
 # Mails
 def runMailsModule():
@@ -130,7 +130,7 @@ def runMailsModule():
 	constant.defaultpass = args['defaultpass']
 	constant.specific_path = args['specific_path']
 	constant.mozilla_software = 'Thunderbird'
-	
+
 	launch_module(modules['mails'])
 
 # Chats
@@ -148,7 +148,7 @@ def runBrowsersModule():
 	constant.defaultpass = args['defaultpass']
 	constant.specific_path = args['specific_path']
 	constant.mozilla_software = 'Firefox'
-	
+
 	launch_module(modules['browsers'])
 
 # All
@@ -160,7 +160,7 @@ def runAllModules():
 	time.sleep(time_to_sleep)
 	runDatabaseModule()
 	time.sleep(time_to_sleep)
-	runAdminsysModule()
+	runSysadminModule()
 	time.sleep(time_to_sleep)
 	runMailsModule()
 	time.sleep(time_to_sleep)
@@ -223,11 +223,11 @@ def error(self, message):
 PMails._optionals.title = 'Email clients supported'
 PMails.add_argument('-t', action='store_true', dest='thunderbird', help='thunderbird')
 
-#1.3- Parent parser: adminsys
-PAdminsys = argparse.ArgumentParser(add_help=False,formatter_class=lambda prog: argparse.HelpFormatter(prog, max_help_position=constant.MAX_HELP_POSITION))
-PAdminsys._optionals.title = 'SCP/SSH/FTP/FTPS clients supported'
-PAdminsys.add_argument('-f', action='store_true', dest='filezilla', help='filezilla')
-PAdminsys.add_argument('-e', action='store_true', dest='env', help='environment variables')
+#1.3- Parent parser: sysadmin
+PSysadmin = argparse.ArgumentParser(add_help=False,formatter_class=lambda prog: argparse.HelpFormatter(prog, max_help_position=constant.MAX_HELP_POSITION))
+PSysadmin._optionals.title = 'SCP/SSH/FTP/FTPS clients supported'
+PSysadmin.add_argument('-f', action='store_true', dest='filezilla', help='filezilla')
+PSysadmin.add_argument('-e', action='store_true', dest='env', help='environment variables')
 
 #1.4- Parent parser: database
 PDatabase = argparse.ArgumentParser(add_help=False,formatter_class=lambda prog: argparse.HelpFormatter(prog, max_help_position=constant.MAX_HELP_POSITION))
@@ -267,9 +267,9 @@ def error(self, message):
 parser_mails = subparsers.add_parser('mails',parents=[PPoptional, PMails, PMasterPass_Firefox, PWrite],help='Run mails module')
 parser_mails.set_defaults(func=runMailsModule,auditType='mails')
 
-#2.e- Run adminsys module
-parser_adminsys = subparsers.add_parser('adminsys',parents=[PPoptional, PAdminsys, PWrite],help='Run adminsys module')
-parser_adminsys.set_defaults(func=runAdminsysModule,auditType='adminsys')
+#2.e- Run sysadmin module
+parser_sysadmin = subparsers.add_parser('sysadmin',parents=[PPoptional, PSysadmin, PWrite],help='Run sysadmin module')
+parser_sysadmin.set_defaults(func=runSysadminModule,auditType='sysadmin')
 
 #2.f- Run database module
 parser_database = subparsers.add_parser('database',parents=[PPoptional, PDatabase, PWrite],help='Run database module')

diff --git a/Linux/src/softwares/adminsys/__init__.py b/Linux/src/softwares/adminsys/__init__.py
diff --git a/Linux/src/softwares/adminsys/env_variable.py b/Linux/src/softwares/adminsys/env_variable.py
diff --git a/Linux/src/softwares/adminsys/filezilla.py b/Linux/src/softwares/adminsys/filezilla.py
diff --git a/Linux/standalone/LaZagne b/Linux/standalone/LaZagne
diff --git a/Windows/src/LaZagne/laZagne.py b/Windows/src/LaZagne/laZagne.py
@@ -20,13 +20,13 @@
 # windows
 from softwares.windows.network import Network
 from softwares.windows.dot_net import Dot_net
-# adminsys
-from softwares.adminsys.filezilla import Filezilla
-from softwares.adminsys.cyberduck import Cyberduck
-from softwares.adminsys.puttycm import Puttycm
-from softwares.adminsys.winscp import WinSCP
-from softwares.adminsys.coreftp import CoreFTP
-from softwares.adminsys.ftpnavigator import FtpNavigator
+# sysadmin
+from softwares.sysadmin.filezilla import Filezilla
+from softwares.sysadmin.cyberduck import Cyberduck
+from softwares.sysadmin.puttycm import Puttycm
+from softwares.sysadmin.winscp import WinSCP
+from softwares.sysadmin.coreftp import CoreFTP
+from softwares.sysadmin.ftpnavigator import FtpNavigator
 # svn
 from softwares.svn.tortoise import Tortoise
 # chats
@@ -69,13 +69,13 @@
 modules['database']['squirrel'] = Squirrel()
 modules['database']['dbvis'] = Dbvisualizer()
 # SCP/SSH/FTP/FTPS clients
-modules['adminsys'] = {}
-modules['adminsys']['filezilla'] = Filezilla()
-modules['adminsys']['cyberduck'] = Cyberduck()
-modules['adminsys']['puttycm'] = Puttycm()
-modules['adminsys']['winscp'] = WinSCP()
-modules['adminsys']['coreftp'] = CoreFTP()
-modules['adminsys']['ftpnavigator'] = FtpNavigator()
+modules['sysadmin'] = {}
+modules['sysadmin']['filezilla'] = Filezilla()
+modules['sysadmin']['cyberduck'] = Cyberduck()
+modules['sysadmin']['puttycm'] = Puttycm()
+modules['sysadmin']['winscp'] = WinSCP()
+modules['sysadmin']['coreftp'] = CoreFTP()
+modules['sysadmin']['ftpnavigator'] = FtpNavigator()
 # Mails
 modules['mails'] = {}
 modules['mails']['outlook'] = Outlook()
@@ -147,8 +147,8 @@ def runDatabaseModule():
 	launch_module(modules['database'])
 
 # SCP/SSH/FTP/FTPS clients
-def runAdminsysModule():
-	launch_module(modules['adminsys'])
+def runSysadminModule():
+	launch_module(modules['sysadmin'])
 
 # Mails
 def runMailsModule():
@@ -199,7 +199,7 @@ def runAllModules():
 	time.sleep(time_to_sleep)
 	runDatabaseModule()
 	time.sleep(time_to_sleep)
-	runAdminsysModule()
+	runSysadminModule()
 	time.sleep(time_to_sleep)
 	runMailsModule()
 	time.sleep(time_to_sleep)
@@ -276,15 +276,15 @@ def error(self, message):
 PMails.add_argument('-o', action='store_true', dest='outlook', help='outlook - IMAP, POP3, HTTP, SMTP, LDPAP (not Exchange)')
 PMails.add_argument('-t', action='store_true', dest='thunderbird', help='thunderbird')
 
-#1.3- Parent parser: adminsys
-PAdminsys = argparse.ArgumentParser(add_help=False,formatter_class=lambda prog: argparse.HelpFormatter(prog, max_help_position=constant.MAX_HELP_POSITION))
-PAdminsys._optionals.title = 'SCP/SSH/FTP/FTPS clients supported'
-PAdminsys.add_argument('-f', action='store_true', dest='filezilla', help='filezilla')
-PAdminsys.add_argument('-c', action='store_true', dest='cyberduck', help='cyberduck')
-PAdminsys.add_argument('-p', action='store_true', dest='puttycm', help='puttycm')
-PAdminsys.add_argument('-scp', action='store_true', dest='winscp', help='winscp')
-PAdminsys.add_argument('-core', action='store_true', dest='coreftp', help='coreftp')
-PAdminsys.add_argument('-ftp', action='store_true', dest='ftpnavigator', help='FTP Navigator')
+#1.3- Parent parser: sysadmin
+PSysadmin = argparse.ArgumentParser(add_help=False,formatter_class=lambda prog: argparse.HelpFormatter(prog, max_help_position=constant.MAX_HELP_POSITION))
+PSysadmin._optionals.title = 'SCP/SSH/FTP/FTPS clients supported'
+PSysadmin.add_argument('-f', action='store_true', dest='filezilla', help='filezilla')
+PSysadmin.add_argument('-c', action='store_true', dest='cyberduck', help='cyberduck')
+PSysadmin.add_argument('-p', action='store_true', dest='puttycm', help='puttycm')
+PSysadmin.add_argument('-scp', action='store_true', dest='winscp', help='winscp')
+PSysadmin.add_argument('-core', action='store_true', dest='coreftp', help='coreftp')
+PSysadmin.add_argument('-ftp', action='store_true', dest='ftpnavigator', help='FTP Navigator')
 
 #1.4- Parent parser: database
 PDatabase = argparse.ArgumentParser(add_help=False,formatter_class=lambda prog: argparse.HelpFormatter(prog, max_help_position=constant.MAX_HELP_POSITION))
@@ -331,9 +331,9 @@ def error(self, message):
 parser_mails = subparsers.add_parser('mails',parents=[PPoptional, PMails, PMode, PMasterPass_Firefox, PWrite],help='Run mails module')
 parser_mails.set_defaults(func=runMailsModule,auditType='mails')
 
-#2.e- Run adminsys module
-parser_adminsys = subparsers.add_parser('adminsys',parents=[PPoptional, PAdminsys, PWrite],help='Run adminsys module')
-parser_adminsys.set_defaults(func=runAdminsysModule,auditType='adminsys')
+#2.e- Run sysadmin module
+parser_sysadmin = subparsers.add_parser('sysadmin',parents=[PPoptional, PSysadmin, PWrite],help='Run sysadmin module')
+parser_sysadmin.set_defaults(func=runSysadminModule,auditType='sysadmin')
 
 #2.f- Run database module
 parser_database = subparsers.add_parser('database',parents=[PPoptional, PDatabase, PWrite],help='Run database module')

diff --git a/Windows/src/LaZagne/softwares/adminsys/__init__.py b/Windows/src/LaZagne/softwares/adminsys/__init__.py