m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

now in /settings/, admin can input several email addreses instead of only one 

delete mail settings in /admin/ (need to reconfig the docklet.conf)
This commit is contained in:
Peidong Liu 2017-06-16 01:18:35 +08:00
parent 26b9c6cf81
commit 2057f4535b
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/sysmgr.py
View File

@ -1,7 +1,7 @@
import re, string, os
editableParms = ["ADMIN_EMAIL_ADDRESS","LOG_LEVEL"]
editableParms = ["LOG_LEVEL"]
configPath = {"docklet": os.environ.get("DOCKLET_CONF")+"/docklet.conf",
"container": os.environ.get("DOCKLET_CONF")+"/container.conf"}
#configPath = {"docklet": "../conf/docklet.conf",
@ -43,11 +43,11 @@ class SystemManager():
for line in lines:
[linekind, lineparm, lineval] = parse_line(line)
if lineparm in editableParms:
editable = 1
editable = 1 # edit it in settings.py
else:
editable = 0
if linekind == "default":
conf[lineparm] = {"val": "novalidvaluea", "default": lineval,
conf[lineparm] = {"val": "novalidvaluea", "default": lineval,
"history": [], "editable": editable, "details": ""}
for line in lines:
[linekind, lineparm, lineval] = parse_line(line)
@ -59,7 +59,7 @@ class SystemManager():
editable = 1
else:
editable = 0
conf[lineparm] = {"val": lineval, "default": lineval,
conf[lineparm] = {"val": lineval, "default": lineval,
"history": [], "editable": editable, "details": ""}
for line in lines:
[linekind, lineparm, lineval] = parse_line(line)
@ -69,7 +69,7 @@ class SystemManager():
for seg in segs:
if parm in seg:
conf[parm]["details"] = seg
result[field] = [({'parm': parm, 'val': conf[parm]['val'],
result[field] = [({'parm': parm, 'val': conf[parm]['val'],
'default': conf[parm]['default'], "history": conf[parm]['history'],
"editable": conf[parm]['editable'], "details": conf[parm]['details']}) for parm in sorted(conf.keys())]
configFile = open(configPath["container"])
@ -89,7 +89,7 @@ class SystemManager():
line = lines[i]
[linekind, lineparm, lineval] = parse_line(line)
if linekind == "active" and lineparm == parm:
lines[i] = "## " + parm + "=" + lineval + "\n"
lines[i] = "## " + parm + "=" + lineval + "\n"
lines.insert(i, parm + "=" + val + "\n")
if i == 0 or not parm in lines[i-1] or not "=" in lines[i-1]:
lines.insert(i, "# " + parm + "=" + lineval + "\n")
@ -176,7 +176,7 @@ class SystemManager():
line = lines[i]
if activePattern.match(line) != None and not "#" in line:
segs = line.replace("\n", "").split("=")
lines[i] = segs[0].strip() + "=" + conf[segs[0].strip()]["default"] + "\n"
lines[i] = segs[0].strip() + "=" + conf[segs[0].strip()]["default"] + "\n"
elif historyPattern.match(line) != None and not "==" in line:
lines[i] = ""
configFile = open(configPath[field], "w")
@ -187,4 +187,3 @@ class SystemManager():
#sysmgr = SystemManager()
#print(sysmgr.getParmList())

4
web/templates/admin.html
View File

@ -154,7 +154,7 @@
<th> {{ group['quotas'][quota['name']] }} </th>
{% endfor %}
<th><a class="btn btn-xs btn-info" data-toggle="modal" data-target="#ModifyGroupModal_{{ group['name'] }}">Edit</a>&nbsp;
{% if group['name'] in [ "root", "primary", "admin", "foundation" ] %}
{% if group['name'] in [ "root", "primary", "admin", "foundation" ] %}
<a class="btn btn-xs btn-default" href="javascript:void(0)">Delete</a>&nbsp;
{% else %}
<a class="btn btn-xs btn-danger" href="/group/delete/{{group['name']}}">Delete</a>&nbsp;
@ -334,7 +334,7 @@
{% if parm["val"] == "novalidvaluea" %}
<th class="text-muted">No Valid Value</th>
{% elif parm["val"]|length > 20 %}
{% elif parm["val"]|length > 20 %}
<th title="{{parm["val"]}}">{{ parm["val"]|truncate(20) }}</th>
{% else %}
<th>{{ parm["val"] }}</th>

2
web/templates/settings.html
View File

@ -34,7 +34,7 @@
<label for="ADMIN_EMAIL_ADDRESS">Admin Email Address</label>
<p class="help-block">when an activating request is sent, an e-mail will be sent to this address to remind the admin. </p>
<p class="help-block">if this address is "", no email will be sent to admin.</p>
<input type="email" class="form-control" id="ADMIN_EMAIL_ADDRESS" value="{{ settings['ADMIN_EMAIL_ADDRESS'] }}" name="ADMIN_EMAIL_ADDRESS">
<input type="input" class="form-control" id="ADMIN_EMAIL_ADDRESS" value="{{ settings['ADMIN_EMAIL_ADDRESS'] }}" name="ADMIN_EMAIL_ADDRESS">
</div>
<div class="form-group">
<label for="EMAIL_FROM_ADDRESS">Email From Address</label>