Merge pull request quattor#1837 from jrha/cleanup-metaconfig-httpd

ncm-metaconfig: httpd: Fix wrapping, indentation and lint issues in pan code

Author: jrha

ncm-metaconfig/src/main/metaconfig/httpd/2.2/tests/profiles/graphite-web.pan

@@ -14,11 +14,11 @@ variable HOSTNAME = 'myhost';
 variable DB_IP = dict(HOSTNAME, '1.2.3.4');
 
 "/software/components/metaconfig/services/{/etc/httpd/conf.d/graphite-web.conf}/contents/vhosts/graphiteweb" = {
-    base=create(format('struct/ssl_conf_%s', HTTPD_OS_FLAVOUR));
+    base = create(format('struct/ssl_conf_%s', HTTPD_OS_FLAVOUR));
 
-    pubvhost=create('struct/public_vhost');
+    pubvhost = create('struct/public_vhost');
 
-    foreach(idx;val;list('certificatefile', 'certificatekeyfile', 'cacertificatefile')) {
+    foreach(idx; val; list('certificatefile', 'certificatekeyfile', 'cacertificatefile')) {
         base['vhosts']['base']['ssl'][val] = pubvhost['ssl'][val];
     };
 
@@ -46,12 +46,12 @@ prefix "/software/components/metaconfig/services/{/etc/httpd/conf.d/graphite-web
     append(dict(
         "url", "/media/",
         "destination", "/usr/lib/python2.6/site-packages/django/contrib/admin/media/",
-        ));
+    ));
     append(dict(
         "url", "/",
         "destination", "/usr/share/graphite/graphite-web.wsgi",
         "type", "wsgiscript",
-        ));
+    ));
 };
 
 
@@ -60,29 +60,29 @@ prefix "/software/components/metaconfig/services/{/etc/httpd/conf.d/graphite-web
         "name", "/content/",
         "handler", dict(
             "set", "None",
-            ),
-        ));
+        ),
+    ));
     append(dict(
         "name", "/media/",
         "handler", dict(
             "set", "None",
-            ),
-        ));
+        ),
+    ));
     append(dict(
         "name", "/",
         "access", dict( # by default, block all
             "deny", list("all"),
             "satisfy", "Any",
             "order", list("allow", "deny"),
-            ),
+        ),
         "limit", dict( # do not allow PUT and DELETE of ES data via kibana interface
             "name", list("PUT", "DELETE"),
             "access", dict(
                 "order", list("allow", "deny"),
                 "deny", list("all"),
-                ),
             ),
-        ));
+        ),
+    ));
 };
 
 "wsgi/importscript" = dict(

ncm-metaconfig/src/main/metaconfig/httpd/2.2/tests/profiles/struct/default_vhost.pan

@@ -18,6 +18,7 @@ structure template struct/default_vhost;
 "log/level" = "warn";
 "log/error" = format("logs/%s_%s_error_log", value("servername"), value("port"));
 "log/transfer" = format("logs/%s_%s_access_log", value("servername"), value("port"));
-"log/custom"=append(dict(
+"log/custom" = append(dict(
     "location", format("logs/%s_%s_request_log", value("servername"), value("port")),
-    "name", "ssl_combined"));
+    "name", "ssl_combined",
+));