mv init_pw_db to rz_cli_tool, improve

1 files changed, 0 insertions, 15 deletions

diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index e8fec231..118cfa16 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -248,21 +248,10 @@ def init_config(cfg_dir):
     cfg = Config.init_from_file(cfg_path)
     return cfg
 
-def init_pw_db(cfg, user_pw_list_file):
-    if not os.path.exists(user_pw_list_file):
-        print("error: missing specified htpasswd init file '%s'" % user_pw_list_file)
-        raise SystemExit
-    with open(user_pw_list_file) as user_pwd_list_fd:
-        for line in user_pwd_list_fd:
-            u, p = [word.strip() for word in line.split(',')]
-            crypt_util.add_user_login(cfg, u, p)
-
 if __name__ == "__main__":
 
     p = argparse.ArgumentParser(description='rhizi-server')
     p.add_argument('--config-dir', help='path to Rhizi config dir', default='res/etc')
-    p.add_argument('--init-htpasswd-db', help='init login htpasswd db', action='store_const', const=True)
-    p.add_argument('--htpasswd-init-file', help='htpasswd db initialization file in \'user,pw\' format')
     args = p.parse_args()
 
     cfg = init_config(args.config_dir)
@@ -273,10 +262,6 @@ if __name__ == "__main__":
     if False == cfg.access_control:
         log.warn('access control disabled, all-granted access set on all URLs')
 
-    if args.init_htpasswd_db:
-        init_pw_db(cfg, args.htpasswd_init_file)
-        exit(0)
-
     kernel = RZ_Kernel()
     webapp = init_webapp(cfg, kernel)
     ws_srv = init_ws_interface(cfg, kernel, webapp)