From: Frank Brehm Date: Fri, 9 Feb 2018 10:56:36 +0000 (+0100) Subject: Bugfixing in searching module path, increasing year of copyright to 2018 X-Git-Tag: 0.1.2~6^2~24 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=463664dfe55b0e988e2e6d3a548e60410dcf2f2e;p=pixelpark%2Fadmin-tools.git Bugfixing in searching module path, increasing year of copyright to 2018 --- diff --git a/bin/barracuda-sync b/bin/barracuda-sync index 8607c19..e9b5beb 100755 --- a/bin/barracuda-sync +++ b/bin/barracuda-sync @@ -11,7 +11,9 @@ cur_dir = os.getcwd() base_dir = cur_dir if sys.argv[0] != '' and sys.argv[0] != '-c': - bin_dir = os.path.dirname(sys.argv[0]) + bin_dir = os.path.dirname(os.path.realpath(sys.argv[0])) +else: + bin_dir = os.path.dirname(os.path.realpath(__file__)) base_dir = os.path.abspath(os.path.join(bin_dir, '..')) module_dir = os.path.join(base_dir, 'pp_lib') if os.path.exists(module_dir): @@ -22,7 +24,7 @@ from pp_lib.barracuda_sync_app import PpBarracudaSyncApp log = logging.getLogger(__name__) __author__ = 'Frank Brehm ' -__copyright__ = '(C) 2017 by Frank Brehm, Pixelpark GmbH, Berlin' +__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin' appname = os.path.basename(sys.argv[0]) diff --git a/bin/check-dnsui-users b/bin/check-dnsui-users index 0d8c667..f8af48e 100755 --- a/bin/check-dnsui-users +++ b/bin/check-dnsui-users @@ -11,7 +11,9 @@ cur_dir = os.getcwd() base_dir = cur_dir if sys.argv[0] != '' and sys.argv[0] != '-c': - bin_dir = os.path.dirname(sys.argv[0]) + bin_dir = os.path.dirname(os.path.realpath(sys.argv[0])) +else: + bin_dir = os.path.dirname(os.path.realpath(__file__)) base_dir = os.path.abspath(os.path.join(bin_dir, '..')) module_dir = os.path.join(base_dir, 'pp_lib') if os.path.exists(module_dir): diff --git a/bin/dns-deploy-zones b/bin/dns-deploy-zones index 04f0b0c..3a038c5 100755 --- a/bin/dns-deploy-zones +++ b/bin/dns-deploy-zones @@ -11,7 +11,9 @@ cur_dir = os.getcwd() base_dir = cur_dir if sys.argv[0] != '' and sys.argv[0] != '-c': - bin_dir = os.path.dirname(sys.argv[0]) + bin_dir = os.path.dirname(os.path.realpath(sys.argv[0])) +else: + bin_dir = os.path.dirname(os.path.realpath(__file__)) base_dir = os.path.abspath(os.path.join(bin_dir, '..')) module_dir = os.path.join(base_dir, 'pp_lib') if os.path.exists(module_dir): @@ -23,7 +25,7 @@ from pp_lib.deploy_zones_from_pdns import PpDeployZonesApp log = logging.getLogger(__name__) __author__ = 'Frank Brehm ' -__copyright__ = '(C) 2017 by Frank Brehm, Pixelpark GmbH, Berlin' +__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin' appname = os.path.basename(sys.argv[0]) diff --git a/bin/format-du b/bin/format-du index f26a00a..9c25f9f 100755 --- a/bin/format-du +++ b/bin/format-du @@ -11,7 +11,9 @@ cur_dir = os.getcwd() base_dir = cur_dir if sys.argv[0] != '' and sys.argv[0] != '-c': - bin_dir = os.path.dirname(sys.argv[0]) + bin_dir = os.path.dirname(os.path.realpath(sys.argv[0])) +else: + bin_dir = os.path.dirname(os.path.realpath(__file__)) base_dir = os.path.abspath(os.path.join(bin_dir, '..')) module_dir = os.path.join(base_dir, 'pp_lib') if os.path.exists(module_dir): @@ -22,7 +24,7 @@ from pp_lib.format_du import FormatDuApp log = logging.getLogger(__name__) __author__ = 'Frank Brehm ' -__copyright__ = '(C) 2017 by Frank Brehm, Pixelpark GmbH, Berlin' +__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin' appname = os.path.basename(sys.argv[0]) diff --git a/bin/import-pdnsdata b/bin/import-pdnsdata index 42bbd3e..390d590 100755 --- a/bin/import-pdnsdata +++ b/bin/import-pdnsdata @@ -11,7 +11,9 @@ cur_dir = os.getcwd() base_dir = cur_dir if sys.argv[0] != '' and sys.argv[0] != '-c': - bin_dir = os.path.dirname(sys.argv[0]) + bin_dir = os.path.dirname(os.path.realpath(sys.argv[0])) +else: + bin_dir = os.path.dirname(os.path.realpath(__file__)) base_dir = os.path.abspath(os.path.join(bin_dir, '..')) module_dir = os.path.join(base_dir, 'pp_lib') if os.path.exists(module_dir): @@ -22,7 +24,7 @@ from pp_lib.import_pdnsdata import ImportPdnsdataApp log = logging.getLogger(__name__) __author__ = 'Frank Brehm ' -__copyright__ = '(C) 2017 by Frank Brehm, Pixelpark GmbH, Berlin' +__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin' appname = os.path.basename(sys.argv[0]) diff --git a/bin/pdns-list-zones b/bin/pdns-list-zones index 40e10da..77b38b4 100755 --- a/bin/pdns-list-zones +++ b/bin/pdns-list-zones @@ -11,7 +11,9 @@ cur_dir = os.getcwd() base_dir = cur_dir if sys.argv[0] != '' and sys.argv[0] != '-c': - bin_dir = os.path.dirname(sys.argv[0]) + bin_dir = os.path.dirname(os.path.realpath(sys.argv[0])) +else: + bin_dir = os.path.dirname(os.path.realpath(__file__)) base_dir = os.path.abspath(os.path.join(bin_dir, '..')) module_dir = os.path.join(base_dir, 'pp_lib') if os.path.exists(module_dir): @@ -22,7 +24,7 @@ from pp_lib.pdns_list_zones import PpPDNSListZonesApp log = logging.getLogger(__name__) __author__ = 'Frank Brehm ' -__copyright__ = '(C) 2017 by Frank Brehm, Pixelpark GmbH, Berlin' +__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin' appname = os.path.basename(sys.argv[0]) diff --git a/bin/pdns-migrate-nameservers b/bin/pdns-migrate-nameservers index 70c9f46..b4e0cc5 100755 --- a/bin/pdns-migrate-nameservers +++ b/bin/pdns-migrate-nameservers @@ -11,7 +11,9 @@ cur_dir = os.getcwd() base_dir = cur_dir if sys.argv[0] != '' and sys.argv[0] != '-c': - bin_dir = os.path.dirname(sys.argv[0]) + bin_dir = os.path.dirname(os.path.realpath(sys.argv[0])) +else: + bin_dir = os.path.dirname(os.path.realpath(__file__)) base_dir = os.path.abspath(os.path.join(bin_dir, '..')) module_dir = os.path.join(base_dir, 'pp_lib') if os.path.exists(module_dir): diff --git a/bin/pdns-show-zone b/bin/pdns-show-zone index f437b28..f607a96 100755 --- a/bin/pdns-show-zone +++ b/bin/pdns-show-zone @@ -11,7 +11,9 @@ cur_dir = os.getcwd() base_dir = cur_dir if sys.argv[0] != '' and sys.argv[0] != '-c': - bin_dir = os.path.dirname(sys.argv[0]) + bin_dir = os.path.dirname(os.path.realpath(sys.argv[0])) +else: + bin_dir = os.path.dirname(os.path.realpath(__file__)) base_dir = os.path.abspath(os.path.join(bin_dir, '..')) module_dir = os.path.join(base_dir, 'pp_lib') if os.path.exists(module_dir): @@ -22,7 +24,7 @@ from pp_lib.pdns_show_zone import PpPDNSShowZoneApp log = logging.getLogger(__name__) __author__ = 'Frank Brehm ' -__copyright__ = '(C) 2017 by Frank Brehm, Pixelpark GmbH, Berlin' +__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin' appname = os.path.basename(sys.argv[0]) diff --git a/mk-home b/mk-home index c1d15dd..e44b5a7 100755 --- a/mk-home +++ b/mk-home @@ -20,7 +20,7 @@ from pp_lib.mk_home_app import PpMkHomeApp log = logging.getLogger(__name__) __author__ = 'Frank Brehm ' -__copyright__ = '(C) 2017 by Frank Brehm, Pixelpark GmbH, Berlin' +__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin' appname = os.path.basename(sys.argv[0]) diff --git a/pp_lib/app.py b/pp_lib/app.py index b8aee1e..f3f9400 100644 --- a/pp_lib/app.py +++ b/pp_lib/app.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for the application object. """ from __future__ import absolute_import diff --git a/pp_lib/barracuda_sync_app.py b/pp_lib/barracuda_sync_app.py index 166ecf5..6ed67f1 100644 --- a/pp_lib/barracuda_sync_app.py +++ b/pp_lib/barracuda_sync_app.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for the barracuda-sync application object. """ from __future__ import absolute_import diff --git a/pp_lib/cfg_app.py b/pp_lib/cfg_app.py index 6d97662..6efbe10 100644 --- a/pp_lib/cfg_app.py +++ b/pp_lib/cfg_app.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for the application object with support for configuration files. """ diff --git a/pp_lib/common.py b/pp_lib/common.py index 55b6207..e0d7729 100644 --- a/pp_lib/common.py +++ b/pp_lib/common.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for common used functions. """ diff --git a/pp_lib/config_named_app.py b/pp_lib/config_named_app.py index 6b4db7a..9ec3133 100644 --- a/pp_lib/config_named_app.py +++ b/pp_lib/config_named_app.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: A module for the application class for configuring named """ from __future__ import absolute_import @@ -1356,8 +1356,8 @@ class PpConfigNamedApp(PpConfigApplication): # 'last_check': 0, # 'masters': [], # 'name': '56.66.217.in-addr.arpa.', - # 'notified_serial': 2017080202, - # 'serial': 2017080202, + # 'notified_serial': 2018080202, + # 'serial': 2018080202, # 'url': 'api/v1/servers/localhost/zones/56.66.217.in-addr.arpa.'}, zone_name = entry['name'] diff --git a/pp_lib/deploy_zones_from_pdns.py b/pp_lib/deploy_zones_from_pdns.py index fe5b66b..4c404d0 100644 --- a/pp_lib/deploy_zones_from_pdns.py +++ b/pp_lib/deploy_zones_from_pdns.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: A module for the application class for configuring named """ from __future__ import absolute_import diff --git a/pp_lib/du.py b/pp_lib/du.py index e130327..8f731b1 100644 --- a/pp_lib/du.py +++ b/pp_lib/du.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2010 - 2017 by Frank Brehm, Publicies Pixelpark GmbH, Berlin +@copyright: © 2018 by Frank Brehm, Publicies Pixelpark GmbH, Berlin """ from __future__ import absolute_import diff --git a/pp_lib/format_du.py b/pp_lib/format_du.py index 0948248..596f400 100644 --- a/pp_lib/format_du.py +++ b/pp_lib/format_du.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for the application object. """ from __future__ import absolute_import diff --git a/pp_lib/global_version.py b/pp_lib/global_version.py index c6d9259..3477028 100644 --- a/pp_lib/global_version.py +++ b/pp_lib/global_version.py @@ -3,13 +3,13 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Publicis Pixelpark GmbH, Berlin @summary: Modules global version number """ __author__ = 'Frank Brehm ' __contact__ = 'frank.brehm@pixelpark.com' -__version__ = '0.6.3' +__version__ = '0.6.4' __license__ = 'LGPL3+' # vim: fileencoding=utf-8 filetype=python ts=4 diff --git a/pp_lib/homes_admin.py b/pp_lib/homes_admin.py index 38adf0d..af5f03d 100644 --- a/pp_lib/homes_admin.py +++ b/pp_lib/homes_admin.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The base module all maintaining scripts for the home directories """ from __future__ import absolute_import diff --git a/pp_lib/import_pdnsdata.py b/pp_lib/import_pdnsdata.py index ff9c064..93caabe 100644 --- a/pp_lib/import_pdnsdata.py +++ b/pp_lib/import_pdnsdata.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for the 'import-pdnsdata' application to import all data from the current PowerDNS database """ diff --git a/pp_lib/ldap_app.py b/pp_lib/ldap_app.py index 33b43cd..460a297 100644 --- a/pp_lib/ldap_app.py +++ b/pp_lib/ldap_app.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for a LDAP based application object. """ from __future__ import absolute_import diff --git a/pp_lib/mailaddress.py b/pp_lib/mailaddress.py index 6f915b2..11c7f8f 100644 --- a/pp_lib/mailaddress.py +++ b/pp_lib/mailaddress.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2010 - 2016 by Frank Brehm, ProfitBricks GmbH, Berlin +@copyright: © 2018 by Frank Brehm, Publicis Pixelpark GmbH, Berlin @summary: The module for the MailAddress object. """ from __future__ import absolute_import diff --git a/pp_lib/mk_home_app.py b/pp_lib/mk_home_app.py index c750c83..ce8b05c 100644 --- a/pp_lib/mk_home_app.py +++ b/pp_lib/mk_home_app.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for the mk-home application object. """ from __future__ import absolute_import diff --git a/pp_lib/obj.py b/pp_lib/obj.py index dcee060..8208c98 100644 --- a/pp_lib/obj.py +++ b/pp_lib/obj.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2010 - 2017 by Frank Brehm, Publicies Pixelpark GmbH, Berlin +@copyright: © 2018 by Frank Brehm, Publicies Pixelpark GmbH, Berlin """ from __future__ import absolute_import diff --git a/pp_lib/pdns_app.py b/pp_lib/pdns_app.py index d7f14ca..1cda9a9 100644 --- a/pp_lib/pdns_app.py +++ b/pp_lib/pdns_app.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for a application object related to PowerDNS. """ from __future__ import absolute_import diff --git a/pp_lib/pdns_list_zones.py b/pp_lib/pdns_list_zones.py index e61c1df..e7131e2 100644 --- a/pp_lib/pdns_list_zones.py +++ b/pp_lib/pdns_list_zones.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for the pdns-list-zones application object. """ from __future__ import absolute_import diff --git a/pp_lib/pdns_migrate_ns.py b/pp_lib/pdns_migrate_ns.py index 8915e08..595d341 100644 --- a/pp_lib/pdns_migrate_ns.py +++ b/pp_lib/pdns_migrate_ns.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for migration of of nameservers. """ from __future__ import absolute_import diff --git a/pp_lib/pdns_record.py b/pp_lib/pdns_record.py index 3895d3e..55840bd 100644 --- a/pp_lib/pdns_record.py +++ b/pp_lib/pdns_record.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2010 - 2017 by Frank Brehm, Publicies Pixelpark GmbH, Berlin +@copyright: © 2018 by Frank Brehm, Publicies Pixelpark GmbH, Berlin @summary: An encapsulation class for a DNS record object by PowerDNS API """ from __future__ import absolute_import diff --git a/pp_lib/pdns_show_zone.py b/pp_lib/pdns_show_zone.py index b58a36e..f859083 100644 --- a/pp_lib/pdns_show_zone.py +++ b/pp_lib/pdns_show_zone.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for the pdns-show-zone application object. """ from __future__ import absolute_import diff --git a/pp_lib/pdns_zone.py b/pp_lib/pdns_zone.py index 8d27efd..f082465 100644 --- a/pp_lib/pdns_zone.py +++ b/pp_lib/pdns_zone.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2010 - 2017 by Frank Brehm, Publicies Pixelpark GmbH, Berlin +@copyright: © 2018 by Frank Brehm, Publicies Pixelpark GmbH, Berlin @summary: An encapsulation class for zone objects by PowerDNS API """ from __future__ import absolute_import @@ -50,8 +50,8 @@ class PdnsApiZone(PpBaseObject): # 'last_check': 0, # 'masters': [], # 'name': 'bla.ai.', - # 'notified_serial': 2017080404, - # 'serial': 2017080404, + # 'notified_serial': 2018080404, + # 'serial': 2018080404, # 'url': 'api/v1/servers/localhost/zones/bla.ai.'}, self._account = account self._dnssec = dnssec diff --git a/pp_lib/pidfile.py b/pp_lib/pidfile.py index f9b9841..b938c2a 100644 --- a/pp_lib/pidfile.py +++ b/pp_lib/pidfile.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: A module for a pidfile object. It provides methods to define, check, create and remove a pidfile. diff --git a/pp_lib/quota_check.py b/pp_lib/quota_check.py index 4db1ee8..9ad82be 100644 --- a/pp_lib/quota_check.py +++ b/pp_lib/quota_check.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for the quota-check application object. """ from __future__ import absolute_import diff --git a/pp_lib/test_home_app.py b/pp_lib/test_home_app.py index de63a55..99ac907 100644 --- a/pp_lib/test_home_app.py +++ b/pp_lib/test_home_app.py @@ -3,7 +3,7 @@ """ @author: Frank Brehm @contact: frank.brehm@pixelpark.com -@copyright: © 2017 by Frank Brehm, Berlin +@copyright: © 2018 by Frank Brehm, Berlin @summary: The module for the mk-home application object. """ from __future__ import absolute_import diff --git a/quota-check b/quota-check index c4becbd..27a817e 100755 --- a/quota-check +++ b/quota-check @@ -23,7 +23,7 @@ from pp_lib.quota_check import PpQuotaCheckApp log = logging.getLogger(__name__) __author__ = 'Frank Brehm ' -__copyright__ = '(C) 2017 by Frank Brehm, Pixelpark GmbH, Berlin' +__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin' appname = os.path.basename(sys.argv[0]) diff --git a/test-home b/test-home index 935aa9e..15cb7f2 100755 --- a/test-home +++ b/test-home @@ -20,7 +20,7 @@ from pp_lib.test_home_app import PpTestHomeApp log = logging.getLogger(__name__) __author__ = 'Frank Brehm ' -__copyright__ = '(C) 2017 by Frank Brehm, Pixelpark GmbH, Berlin' +__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin' appname = os.path.basename(sys.argv[0])