配置文件修改

pull/2/head
ibuler 2014-11-01 23:12:27 +08:00
parent 5b060a768a
commit f766ba340f
3 changed files with 4 additions and 6 deletions

View File

@ -8,12 +8,10 @@ password = redhat
db = jumpserver db = jumpserver
[jumpserver] [jumpserver]
log_dir = /opt/jumpserver/logs/
user_table = UserManage_user user_table = UserManage_user
assets_table = Assets_assets assets_table = Assets_assets
assets_user_table = Assets_assetsuser assets_user_table = Assets_assetsuser
key = 88aaaf7ffe3c6c04 key = 88aaaf7ffe3c6c04
rsa_dir = /opt/jumpserver/keys
ldap_host = ldap://127.0.0.1:389 ldap_host = ldap://127.0.0.1:389
ldap_base_dn = dc=yolu,dc=com ldap_base_dn = dc=yolu,dc=com
admin_cn = cn=admin,dc=yolu,dc=com admin_cn = cn=admin,dc=yolu,dc=com

View File

@ -19,7 +19,7 @@ import paramiko
import pxssh import pxssh
cur_dir = os.path.dirname(__file__) 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' os.environ['DJANGO_SETTINGS_MODULE'] = 'AutoSa.settings'
from UserManage.models import User from UserManage.models import User
@ -33,7 +33,7 @@ db_port = cf.getint('db', 'port')
db_user = cf.get('db', 'user') db_user = cf.get('db', 'user')
db_password = cf.get('db', 'password') db_password = cf.get('db', 'password')
db_db = cf.get('db', 'db') 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') user_table = cf.get('jumpserver', 'user_table')
assets_table = cf.get('jumpserver', 'assets_table') assets_table = cf.get('jumpserver', 'assets_table')
assets_user_table = cf.get('jumpserver', 'assets_user_table') assets_user_table = cf.get('jumpserver', 'assets_user_table')

View File

@ -19,11 +19,11 @@ import hashlib
from UserManage.forms import UserAddForm, GroupAddForm from UserManage.forms import UserAddForm, GroupAddForm
import paramiko import paramiko
from django.core.servers.basehttp import FileWrapper from django.core.servers.basehttp import FileWrapper
from AutoSa.settings import CONF_DIR
base_dir = "/opt/jumpserver/"
cf = ConfigParser.ConfigParser() cf = ConfigParser.ConfigParser()
cf.read('%s/jumpserver.conf' % base_dir) cf.read('%s/jumpserver.conf' % CONF_DIR)
key = cf.get('jumpserver', 'key') key = cf.get('jumpserver', 'key')
rsa_dir = cf.get('jumpserver', 'rsa_dir') rsa_dir = cf.get('jumpserver', 'rsa_dir')