Browse Source

param --user/--pwd-hash default env var $FTP_USERNAME/PASSWORD_SHA256

Fabian Peter Hammerle 5 years ago
parent
commit
1017d92089
3 changed files with 9 additions and 4 deletions
  1. 1 0
      .gitignore
  2. 7 3
      pyftpd-sink
  3. 1 1
      setup.py

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+/dist

+ 7 - 3
pyftpd-sink

@@ -52,19 +52,23 @@ def _init_argparser():
         metavar='path',
         dest='root_dir_path',
         default=os.getcwd(),
-        help='default: %(default)s',
+        help='default: current working directory',
     )
     argparser.add_argument(
         '--user', '--username',
         metavar='username',
         dest='username',
-        required=True,
+        required=not os.environ.get('FTP_USERNAME'),
+        default=os.environ.get('FTP_USERNAME'),
+        help='default: env var $FTP_USERNAME',
     )
     argparser.add_argument(
         '--pwd-hash', '--password-hash',
         metavar='sha256_hexdigest',
         dest='password_sha256_hexdigest',
-        required=True,
+        required=not os.environ.get('FTP_PASSWORD_SHA256'),
+        default=os.environ.get('FTP_PASSWORD_SHA256'),
+        help='default: env var $FTP_PASSWORD_SHA256',
     )
     argparser.add_argument(
         '--ctrl-port', '--control-port',

+ 1 - 1
setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='pyftpd-sink',
-    version='0.1',
+    version='0.2',
     # description='',
     author='Fabian Peter Hammerle',
     author_email='fabian@hammerle.me',