diff --git a/jumpserver.conf b/jumpserver.conf index 7a1aba394..f5fedf6da 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -8,12 +8,10 @@ password = redhat db = jumpserver [jumpserver] -log_dir = /opt/jumpserver/logs/ user_table = UserManage_user assets_table = Assets_assets assets_user_table = Assets_assetsuser key = 88aaaf7ffe3c6c04 -rsa_dir = /opt/jumpserver/keys ldap_host = ldap://127.0.0.1:389 ldap_base_dn = dc=yolu,dc=com admin_cn = cn=admin,dc=yolu,dc=com diff --git a/jumpserver.py b/jumpserver.py index 43c34326e..9757ee304 100755 --- a/jumpserver.py +++ b/jumpserver.py @@ -19,7 +19,7 @@ import paramiko import pxssh cur_dir = os.path.dirname(__file__) -sys.path.append('%s/webroot/AutoSA/' % cur_dir) +sys.path.append('%s/webroot/AutoSa/' % cur_dir) os.environ['DJANGO_SETTINGS_MODULE'] = 'AutoSa.settings' from UserManage.models import User @@ -33,7 +33,7 @@ db_port = cf.getint('db', 'port') db_user = cf.get('db', 'user') db_password = cf.get('db', 'password') db_db = cf.get('db', 'db') -log_dir = cf.get('jumpserver', 'log_dir') +log_dir = os.path.join(cur_dir, 'logs') user_table = cf.get('jumpserver', 'user_table') assets_table = cf.get('jumpserver', 'assets_table') assets_user_table = cf.get('jumpserver', 'assets_user_table') diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py index 03face8a0..cb8e1cf2b 100644 --- a/webroot/AutoSa/AutoSa/views.py +++ b/webroot/AutoSa/AutoSa/views.py @@ -19,11 +19,11 @@ import hashlib from UserManage.forms import UserAddForm, GroupAddForm import paramiko from django.core.servers.basehttp import FileWrapper +from AutoSa.settings import CONF_DIR -base_dir = "/opt/jumpserver/" cf = ConfigParser.ConfigParser() -cf.read('%s/jumpserver.conf' % base_dir) +cf.read('%s/jumpserver.conf' % CONF_DIR) key = cf.get('jumpserver', 'key') rsa_dir = cf.get('jumpserver', 'rsa_dir')