Merge pull request #1754 from jrha/indentation-freeipa

ncm-freeipa: Cleanup pan templates
quattor · Nov 29, 2024 · b95b979 · b95b979
2 parents 3a81d2d + 2033505
commit b95b979
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ncm-freeipa/src/main/pan/quattor/aii/freeipa/schema.pan b/ncm-freeipa/src/main/pan/quattor/aii/freeipa/schema.pan
@@ -13,11 +13,11 @@ example usage:
 }
 function validate_aii_freeipa_hooks = {
     if (ARGC != 1) {
-        error(format("%s: requires only one argument", FUNCTION));
+        error("%s: requires only one argument", FUNCTION);
     };
 
     if (! exists(SELF[ARGV[0]])) {
-        error(format("%s: no %s hook found.", FUNCTION, ARGV[0]));
+        error("%s: no %s hook found.", FUNCTION, ARGV[0]);
     };
 
 
@@ -27,7 +27,7 @@ function validate_aii_freeipa_hooks = {
     foreach (i; v; hook) {
         if (exists(v['module']) && v['module'] == FREEIPA_AII_MODULE_NAME) {
             if (found) {
-                error(format("%s: second freeipa %s hook found", FUNCTION, name));
+                error("%s: second freeipa %s hook found", FUNCTION, name);
             } else {
                 found = true;
                 ind = i;
@@ -36,7 +36,7 @@ function validate_aii_freeipa_hooks = {
     };
 
     if (! found) {
-        error(format("%s: no freeipa %s hook found with module %s", FUNCTION, ARGV[0], FREEIPA_AII_MODULE_NAME));
+        error("%s: no freeipa %s hook found with module %s", FUNCTION, ARGV[0], FREEIPA_AII_MODULE_NAME);
     };
 
     true;

diff --git a/ncm-freeipa/src/test/resources/server.pan b/ncm-freeipa/src/test/resources/server.pan
@@ -8,20 +8,20 @@ prefix "/software/components/freeipa/server/dns";
 "subnet2.subdomain" = dict(
     "subnet", "10.11.13.0/24",
     "autoreverse", false,
-    );
+);
 
 "subnet3.subdomain" = dict(
     "subnet", "10.11.14.0/24",
     "reverse", "15.11.10",
-    );
+);
 
 prefix "/software/components/freeipa/server/hosts";
 "host1.subnet1.subdomain" = dict();
 "host2.subnet2.subdomain/ip_address" = "10.11.13.1";
 "host3.subnet3.subdomain" = dict(
     "ip_address", "10.11.13.1",
     "macaddress", list("aa:bb:cc:dd:ee:ff"),
-    );
+);
 
 prefix "/software/components/freeipa/server/services";
 "HTTP/hosts" = list("serv1", "serv2");