[broken] Fixes validator issues + confspec call

broken nginx conf + absolute path in slim that is known only at build time

lodel/settings/validator.py

@@ -171,12 +171,14 @@ def boolean_val(value):
         raise SettingsValidationError("A boolean was expected but got '%s' " % value)
     return bool(value)
 
+##@brief Validate a directory path
 def directory_val(value):
     res = SettingValidator('strip')(value)
     if not os.path.isdir(res):
         raise SettingsValidationError("Folowing path don't exists or is not a directory : '%s'"%res)
     return res
 
+##@brief Validate a loglevel value
 def loglevel_val(value):
     valids = ['DEBUG', 'INFO', 'SECURITY', 'ERROR', 'CRITICAL']
     if value.upper() not in valids:
@@ -184,23 +186,34 @@ def loglevel_val(value):
                 "The value '%s' is not a valid loglevel" % value)
     return value.upper()
 
+##@brief Validate a path
 def path_val(value):
     if value is None or not os.path.exists(value):
         raise SettingsValidationError(
                 "path '%s' doesn't exists" % value)
     return value
 
+##@brief Validate None
 def none_val(value):
     if value is None:
         return None
     raise SettingsValidationError("This settings cannot be set in configuration file")
 
+##@brief Validate a string
 def str_val(value):
     try:
         return str(value)
     except Exception as e:
         raise SettingsValidationError("Not able to convert value to string : " + str(e))
 
+##@brief Validate using a regex
+def regex_val(value, pattern):
+    if re.match(pattern, value) is None:
+        raise SettingsValidationError("The value '%s' is not validated by : \
+r\"%s\"" %(value, pattern))
+    return value
+
+##@brief Validate a hostname (ipv4 or ipv6)
 def host_val(value):
     if value == 'localhost':
         return value
@@ -352,6 +365,11 @@ SettingValidator.register_validator(
     emfield_val,
     'EmField name validator')
 
+SettingValidator.register_validator(
+    'regex',
+    regex_val,
+    'RegEx name validator (take re as argument)')
+
 SettingValidator.create_list_validator(
     'list',
     SettingValidator('strip'),

plugins/webui/confspec.py

@@ -8,6 +8,8 @@ CONFSPEC = {
                             SettingValidator('dummy')),
         'listen_port': (    '9090',
                             SettingValidator('int')),
+        'static_url': (     'http://127.0.0.1/static/',
+                            SettingValidator('regex', pattern =  r'^https?://[^/].*$')),
         'virtualenv': (None,
                        SettingValidator('path', none_is_valid=True)),
         'uwsgicmd': ('/usr/bin/uwsgi', SettingValidator('dummy')),

progs/mass_deploy.sh

@@ -112,7 +112,7 @@ for i in $(seq $ninstance)
 do
 	iname="${random_name}_$(printf "%05d" $i)"
 	slim -n $iname -c
-	slim -n $iname -s --interface web
+	slim -n $iname -s --interface web --static-url 'http://127.0.0.1/static'
 	slim -n $iname -m
 
 	#Mongo db database creation

progs/slim/slim.py

@@ -394,7 +394,7 @@ server {
     include uwsgi_params;
     
     location /static/ {
-        alias /lodel2/plugins/webui/templates/
+        alias /lodel2/plugins/webui/templates/;
     }
 
 """
@@ -455,9 +455,6 @@ def get_parser():
     actions.add_argument('-m', '--make', metavar='TARGET', type=str,
         nargs="?", default='not',
         help='Run make for selected instances')
-    actions.add_argument('-t', '--static_url', type=str, nargs="?", 
-	default='http://127.0.0.1/static/', metavar='static_url',
-	help='Set an url for static documents')
     actions.add_argument('--nginx-conf', action='store_const',
         default = False, const=True,
         help="Output a conf for nginx given selected instances")
@@ -473,6 +470,9 @@ to 1 instance")
     confs.add_argument('--interface', type=str,
         help="Select wich interface to run. Possible values are \
 'python' and 'web'")
+    confs.add_argument('-t', '--static-url', type=str, nargs="?", 
+	default='http://127.0.0.1/static/', metavar='URL',
+	help='Set an url for static documents')
     confs.add_argument('--listen-port', type=int,
         help="Select the port on wich the web interface will listen to")
     confs.add_argument('--listen-address', type=str,