diff --git a/gestion/secrets_new.py b/gestion/secrets_new.py index 1706db34..56ee7014 100644 --- a/gestion/secrets_new.py +++ b/gestion/secrets_new.py @@ -25,12 +25,12 @@ Recuperation des secrets depuis /etc/crans/secrets. import sys import os -from syslog import syslog, openlog +from syslog import syslog, openlog, closelog import getpass def get(secret): """ Recupere un secret. """ - openlog('secrets_new') + #openlog('secrets_new') prog = os.path.basename(getattr(sys, 'argv', ['undefined'])[0]) syslog('%s (in %s) asked for %s' % (getpass.getuser(), prog, secret)) try: diff --git a/munin/wifi_auth b/munin/wifi_auth index edc1f1ad..24f7c7d1 100755 --- a/munin/wifi_auth +++ b/munin/wifi_auth @@ -53,9 +53,9 @@ TEMP_FILE=$(mktempfile munin-radius-wifi.XXXXXX) if [ -n "$TEMP_FILE" -a -f "$TEMP_FILE" ] then if [ $ARGS != 0 ]; then - $LOGTAIL -f ${FREERADIUS_LOG} -o ${STATEFILE} | grep 'freeradius\[.*\]:' > ${TEMP_FILE} + $LOGTAIL -f ${FREERADIUS_LOG} -o ${STATEFILE} | grep 'freeradius\(\[.*\]\)\?:' > ${TEMP_FILE} else - $LOGTAIL ${FREERADIUS_LOG} ${STATEFILE} | grep 'freeradius\[.*\]:' > ${TEMP_FILE} + $LOGTAIL ${FREERADIUS_LOG} ${STATEFILE} | grep 'freeradius\(\[.*\]\)\?:' > ${TEMP_FILE} fi success=$(grep -c 'Login OK' ${TEMP_FILE}) failures=$(grep -c 'Login incorrect' ${TEMP_FILE}) diff --git a/wiki/macro/LostSoulsInGroups.py b/wiki/macro/LostSoulsInGroups.py index 8258399c..42740497 100644 --- a/wiki/macro/LostSoulsInGroups.py +++ b/wiki/macro/LostSoulsInGroups.py @@ -21,8 +21,8 @@ def macro_LostSoulsInGroups(macro, args): request = macro.request _ = macro.request.getText - sRet = "

Items in custom groups (Users in custom groups who don't have user accounts)

" - sRet = sRet + "" + sRet = u"

Éléments dans des groupes custom qui ne correspondent pas à un compte wiki :

" + sRet = sRet + u"
" userlist = [] lostsouls = {} for uid in user.getUserList(request): @@ -51,7 +51,7 @@ def macro_LostSoulsInGroups(macro, args): lostsouls[pg] = [st] for k, v in lostsouls.iteritems(): - st = '' % (Page(request, k).link_to(request), ", ".join(v)) + st = u'' % (Page(request, k).link_to(request), ", ".join(v)) sRet = sRet + st sRet = sRet + "
%s%s
%s%s
"