Merge pull request #452 from midoks/dev

update

.gitignore

@@ -110,7 +110,6 @@ tmp/*
 *.zip
 logs/*
 data/*.db
-data/control.conf
 data/iplist.txt
 data/json/index.json
 data/json/config.json

class/core/common.py

@@ -32,7 +32,6 @@ from flask import redirect
 
 
 def init():
-    initSystemControl()
     initDB()
     initDBSshPort()
     initUserInfo()
@@ -146,14 +145,6 @@ def initInitTask():
     api.createCertCron()
 
 
-def initSystemControl():
-    path = 'data/default.db'
-    if os.path.exists(path):
-        return False
-    data_ctl = 'data/control.conf'
-    mw.writeFile(data_ctl, '30')
-
-
 def initUserInfo():
 
     data = mw.M('users').where('id=?', (1,)).getField('password')

data/control.conf

@@ -0,0 +1 @@
+30