Merge branch 'master' into dist/eole/2.6.2/master

creolefuncs/netmask.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+def toCidr(ip,mask=False):
+    """ Convert to CIDR notation
+        ip can be like this : 192.168.5.100/255.255.255.0
+        or you can provide the ip and the mask
+    """
+    from IPy import IP
+    try:
+        if mask:
+            data="{0}/{1}".format(ip,mask)
+        else:
+            data=ip
+        return str(IP(data))
+    except:
+        return data

eole-lemonldap.mk

@@ -0,0 +1 @@
+creolefuncs_DATADIR := $(DESTDIR)/usr/share/creole/funcs

tmpl/handler-nginx.conf

@@ -44,6 +44,9 @@ server {
 
   location = /reload {
     allow 127.0.0.1;
+%for ipaddr in %%ip_ssh_eth0
+	allow %%toCidr(%%ipaddr, %%ipaddr.netmask_ssh_eth0)
+%end for
     deny all;
     include /etc/nginx/fastcgi_params;
     fastcgi_pass unix:/var/run/llng-fastcgi-server/llng-fastcgi.sock;

tmpl/lmConf-1.js

@@ -170,7 +170,7 @@
     "portalDisplayAppslist": 1,
     "confirmFormMethod": "post",
     "domain": "%%nom_domaine_local",
-    "cfgNum": "9",
+    "cfgNum": "1",
     "authentication": "LDAP",
     "samlNameIDFormatMapWindows": "uid",
     "authChoiceModules": {},
@@ -354,7 +354,7 @@
     "mailUrl": "https://%%authWebName/mail.pl",
     "maintenance": 0,
     "jsRedirect": 0,
-    "cfgAuthor": "dwho",
+    "cfgAuthor": "Cadoles",
     "persistentStorageOptions": {
         "LockDirectory": "/var/lib/lemonldap-ng/psessions/lock",
         "Directory": "/var/lib/lemonldap-ng/psessions"