diff --git a/CHANGELOG.md b/CHANGELOG.md index a811f80b..0774b519 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## NGSI Go v0.9.0-next +- Hardening: Add --configDir global flag (#207) - Hardening: Add feature to support OpenID for Keyrock (#206) - Update: Update docker images (#205) - Improve: Add --serial flag to print serial value as NGSI Go version (#204) diff --git a/docs/global.md b/docs/global.md index f2beee05..8ca577c5 100644 --- a/docs/global.md +++ b/docs/global.md @@ -1,14 +1,15 @@ # Global Options -| Options | Description | -| -------------- | ------------------------------------------------ | -| --syslog LEVEL | specify logging LEVEL (off, err, info, debug) | -| --stderr LEVEL | specify logging LEVEL (off, err, info, debug) | -| --config FILE | specify configuration FILE | -| --cache FILE | specify cache FILE | -| --batch, -B | don't use previous args (batch) (default: false) | -| --help | show help (default: false) | -| --version, -v | print the version (default: false) | +| Options | Description | +| --------------- | ------------------------------------------------ | +| --syslog LEVEL | syslog logging LEVEL (off, err, info, debug) | +| --stderr LEVEL | stderr logging LEVEL (off, err, info, debug) | +| --configDir DIR | configuration DIR name | +| --config FILE | configuration FILE name | +| --cache FILE | cache FILE name | +| --batch, -B | don't use previous args (batch) (default: false) | +| --help | show help (default: false) | +| --version, -v | print the version (default: false) | ## syslog diff --git a/e2e/cases/1000_common/0001_ngsi.test b/e2e/cases/1000_common/0001_ngsi.test index 6c093a3c..2249ebd2 100644 --- a/e2e/cases/1000_common/0001_ngsi.test +++ b/e2e/cases/1000_common/0001_ngsi.test @@ -104,6 +104,7 @@ COMMANDS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) diff --git a/e2e/cases/1000_common/0003_help.test b/e2e/cases/1000_common/0003_help.test index 6762ced0..25936988 100644 --- a/e2e/cases/1000_common/0003_help.test +++ b/e2e/cases/1000_common/0003_help.test @@ -67,6 +67,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -101,6 +102,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -136,6 +138,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -169,6 +172,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -204,6 +208,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -238,6 +243,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -272,6 +278,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -311,6 +318,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -344,6 +352,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -378,6 +387,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -413,6 +423,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -448,6 +459,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -482,6 +494,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -521,6 +534,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -554,6 +568,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -588,6 +603,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -622,6 +638,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -656,6 +673,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -690,6 +708,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -722,6 +741,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -764,6 +784,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -804,6 +825,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -840,6 +862,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -873,6 +896,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -906,6 +930,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -939,6 +964,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -969,6 +995,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1000,6 +1027,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1055,6 +1083,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1090,6 +1119,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1128,6 +1158,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1160,6 +1191,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1198,6 +1230,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1237,6 +1270,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1273,6 +1307,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1315,6 +1350,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1347,6 +1383,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1384,6 +1421,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1423,6 +1461,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1497,6 +1536,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1547,6 +1587,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1582,6 +1623,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1621,6 +1663,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1653,6 +1696,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1685,6 +1729,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1726,6 +1771,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1765,6 +1811,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1799,6 +1846,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1834,6 +1882,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1869,6 +1918,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1903,6 +1953,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1943,6 +1994,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -1980,6 +2032,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2019,6 +2072,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2058,6 +2112,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2094,6 +2149,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2141,6 +2197,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2174,6 +2231,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2207,6 +2265,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2250,6 +2309,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2294,6 +2354,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2326,6 +2387,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2369,6 +2431,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2403,6 +2466,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2437,6 +2501,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2473,6 +2538,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2510,6 +2576,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2543,6 +2610,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2577,6 +2645,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2613,6 +2682,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2647,6 +2717,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2687,6 +2758,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2722,6 +2794,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2756,6 +2829,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2795,6 +2869,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2835,6 +2910,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2868,6 +2944,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2907,6 +2984,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2940,6 +3018,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -2975,6 +3054,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3010,6 +3090,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3043,6 +3124,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3083,6 +3165,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3117,6 +3200,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3152,6 +3236,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3186,6 +3271,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3221,6 +3307,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3254,6 +3341,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3293,6 +3381,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3327,6 +3416,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3362,6 +3452,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3398,6 +3489,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3432,6 +3524,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3471,6 +3564,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3505,6 +3599,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3539,6 +3634,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3576,6 +3672,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3611,6 +3708,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3649,6 +3747,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3682,6 +3781,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3716,6 +3816,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3749,6 +3850,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3788,6 +3890,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3821,6 +3924,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3854,6 +3958,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3890,6 +3995,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3930,6 +4036,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -3962,6 +4069,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4003,6 +4111,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4036,6 +4145,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4069,6 +4179,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4105,6 +4216,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4142,6 +4254,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4174,6 +4287,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4213,6 +4327,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4247,6 +4362,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4281,6 +4397,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4317,6 +4434,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4351,6 +4469,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4383,6 +4502,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4421,6 +4541,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4462,6 +4583,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4500,6 +4622,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4542,6 +4665,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4580,6 +4704,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4619,6 +4744,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4656,6 +4782,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4730,6 +4857,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4777,6 +4905,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4811,6 +4940,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4855,6 +4985,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4891,6 +5022,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4927,6 +5059,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4962,6 +5095,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -4999,6 +5133,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5038,6 +5173,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5072,6 +5208,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5106,6 +5243,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5140,6 +5278,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5185,6 +5324,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5228,6 +5368,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5273,6 +5414,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5319,6 +5461,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5357,6 +5500,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5399,6 +5543,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5436,6 +5581,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5473,6 +5619,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5509,6 +5656,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5544,6 +5692,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5587,6 +5736,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5624,6 +5774,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5661,6 +5812,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5718,6 +5870,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5774,6 +5927,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5816,6 +5970,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5854,6 +6009,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5890,6 +6046,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5929,6 +6086,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -5965,6 +6123,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6003,6 +6162,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6044,6 +6204,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6083,6 +6244,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6123,6 +6285,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6163,6 +6326,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6238,6 +6402,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6277,6 +6442,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6315,6 +6481,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6351,6 +6518,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6389,6 +6557,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6427,6 +6596,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6459,6 +6629,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6492,6 +6663,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6525,6 +6697,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6558,6 +6731,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6596,6 +6770,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6628,6 +6803,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6661,6 +6837,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6695,6 +6872,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6728,6 +6906,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6767,6 +6946,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6804,6 +6984,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6842,6 +7023,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6881,6 +7063,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6920,6 +7103,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -6971,6 +7155,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7022,6 +7207,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7062,6 +7248,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7097,6 +7284,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7129,6 +7317,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7168,6 +7357,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7207,6 +7397,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7242,6 +7433,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7276,6 +7468,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7312,6 +7505,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7349,6 +7543,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7385,6 +7580,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7418,6 +7614,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7456,6 +7653,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7492,6 +7690,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7526,6 +7725,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7560,6 +7760,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7600,6 +7801,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7639,6 +7841,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7675,6 +7878,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7710,6 +7914,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7744,6 +7949,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7782,6 +7988,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7817,6 +8024,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7851,6 +8059,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7900,6 +8109,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7949,6 +8159,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -7980,6 +8191,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8018,6 +8230,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8049,6 +8262,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8082,6 +8296,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8114,6 +8329,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8145,6 +8361,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8183,6 +8400,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8220,6 +8438,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8251,6 +8470,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8282,6 +8502,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8312,6 +8533,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8344,6 +8566,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8382,6 +8605,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8417,6 +8641,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8451,6 +8676,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8499,6 +8725,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8546,6 +8773,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8577,6 +8805,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) @@ -8612,6 +8841,7 @@ OPTIONS: GLOBAL OPTIONS: --syslog LEVEL syslog logging LEVEL (off, err, info, debug) --stderr LEVEL stderr logging LEVEL (err, info, debug) + --configDir DIR configuration DIR name --config FILE configuration FILE name --cache FILE cache FILE name --batch, -B don't use previous args (batch) (default: false) diff --git a/e2e/cases/1000_common/1002_config.test b/e2e/cases/1000_common/1002_config.test new file mode 100644 index 00000000..cda466a8 --- /dev/null +++ b/e2e/cases/1000_common/1002_config.test @@ -0,0 +1,138 @@ +# MIT License +# +# Copyright (c) 2020-2021 Kazuhito Suda +# +# This file is part of NGSI Go +# +# https://github.com/lets-fiware/ngsi-go +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +# +# 0000 settings clear +# +ngsi settings clear + +``` +``` + +# +# 0001 --config /tmp/a broker add +# +ngsi --config /tmp/a broker add --host orion --ngsiType v2 --brokerHost http://localhost:1026 + +``` +``` + +# +# 0002 --config /tmp/a broker get +# +ngsi --config /tmp/a broker get --host orion + +``` +brokerHost http://localhost:1026 +ngsiType v2 +``` + +# +# 0011 --cache /tmp/b broker list +# +ngsi --cache /tmp/b broker list + +``` +orion orion-ld +``` + +# +# 0012 --cache /tmp/b version --host orion +# +ngsi --cache /tmp/b version --host orion + +``` +{ +"orion" : { + "version" : "REGEX(.*)", + "uptime" : "REGEX(.*)", + "git_hash" : "REGEX(.*)", + "compile_time" : "REGEX(.*)", + "compiled_by" : "root", + "compiled_in" : "REGEX(.*)", + "release_date" : "REGEX(.*)", + "machine" : "x86_64", + "doc" : "https://fiware-orion.rtfd.io/en/REGEX(.*)/", + "libversions": { + "boost": "REGEX(.*)", + "libcurl": "REGEX(.*)", + "libmosquitto": "REGEX(.*)", + "libmicrohttpd": "REGEX(.*)", + "openssl": "REGEX(.*)", + "rapidjson": "REGEX(.*)", + "mongoc": "REGEX(.*)", + "bson": "REGEX(.*)" + } +} +} +``` + +# +# 0021 --configDir /tmp/configdir broker add +# +ngsi --configDir /tmp/configdir broker add --host orion --ngsiType v2 --brokerHost http://orion:1026 + +``` +``` + +# +# 0022 --configDir /tmp/configdir version --host orion +# +ngsi --configDir /tmp/configdir version --host orion + +``` +{ +"orion" : { + "version" : "REGEX(.*)", + "uptime" : "REGEX(.*)", + "git_hash" : "REGEX(.*)", + "compile_time" : "REGEX(.*)", + "compiled_by" : "root", + "compiled_in" : "REGEX(.*)", + "release_date" : "REGEX(.*)", + "machine" : "x86_64", + "doc" : "https://fiware-orion.rtfd.io/en/REGEX(.*)/", + "libversions": { + "boost": "REGEX(.*)", + "libcurl": "REGEX(.*)", + "libmosquitto": "REGEX(.*)", + "libmicrohttpd": "REGEX(.*)", + "openssl": "REGEX(.*)", + "rapidjson": "REGEX(.*)", + "mongoc": "REGEX(.*)", + "bson": "REGEX(.*)" + } +} +} +``` + +# +# 9999 settings clear +# +ngsi settings clear + +``` +``` diff --git a/internal/ngsicli/common_flags.go b/internal/ngsicli/common_flags.go index 942ed40c..c37c7f49 100644 --- a/internal/ngsicli/common_flags.go +++ b/internal/ngsicli/common_flags.go @@ -32,6 +32,7 @@ package ngsicli var GlobalFlags = []Flag{ SyslogFlag, StderrFlag, + ConfigDirFlag, ConfigFlag, CacheFlag, MarginFlag, @@ -54,6 +55,10 @@ var ( Usage: "stderr logging `LEVEL` (err, info, debug)", Choices: []string{"off", "err", "info", "debug"}, } + ConfigDirFlag = &StringFlag{ + Name: "configDir", + Usage: "configuration `DIR` name", + } ConfigFlag = &StringFlag{ Name: "config", Usage: "configuration `FILE` name", diff --git a/internal/ngsicli/helper_test.go b/internal/ngsicli/helper_test.go index db6abea8..39c6bfcd 100644 --- a/internal/ngsicli/helper_test.go +++ b/internal/ngsicli/helper_test.go @@ -687,6 +687,10 @@ var ( Name: "stderr", Usage: "specify logging `LEVEL` (off, err, info, debug)", } + configDirFlag = &StringFlag{ + Name: "configDir", + Usage: "configuration `DIR` name", + } configFlag = &StringFlag{ Name: "config", Usage: "specify configuration `FILE`", diff --git a/internal/ngsicli/initcmd.go b/internal/ngsicli/initcmd.go index 4adfbc04..1031854f 100644 --- a/internal/ngsicli/initcmd.go +++ b/internal/ngsicli/initcmd.go @@ -49,27 +49,34 @@ func InitCmd(c *Context) (*ngsilib.NGSI, error) { ngsi.BatchFlag = &b } + if c.IsSet("configDir") && (c.IsSet("config") || c.IsSet("cache")) { + return nil, ngsierr.New(funcName, 1, "configDir cannot be specified with config or cache at the same time", nil) + } var file *string if c.IsSet("config") { s := c.String("config") file = &s } + if c.IsSet("configDir") { + s := c.String("configDir") + ngsi.ConfigDir = &s + } err := ngsi.InitConfig(file) if err != nil { - return nil, ngsierr.New(funcName, 1, err.Error(), err) + return nil, ngsierr.New(funcName, 2, err.Error(), err) } prevArgs := ngsi.GetPreviousArgs() err = initStdErrOption(ngsi, c, prevArgs) if err != nil { - return nil, ngsierr.New(funcName, 2, err.Error(), err) + return nil, ngsierr.New(funcName, 3, err.Error(), err) } err = initSyslogOption(ngsi, c, prevArgs) if err != nil { - return nil, ngsierr.New(funcName, 3, err.Error(), err) + return nil, ngsierr.New(funcName, 4, err.Error(), err) } initHiddenOptions(ngsi, c) @@ -81,7 +88,7 @@ func InitCmd(c *Context) (*ngsilib.NGSI, error) { tokenCache := initCacheFileOption(ngsi, c, prevArgs) err = ngsi.InitTokenMgr(tokenCache) if err != nil { - return nil, ngsierr.New(funcName, 4, err.Error(), err) + return nil, ngsierr.New(funcName, 5, err.Error(), err) } return ngsi, nil diff --git a/internal/ngsicli/initcmd_test.go b/internal/ngsicli/initcmd_test.go index 136558f4..50204698 100644 --- a/internal/ngsicli/initcmd_test.go +++ b/internal/ngsicli/initcmd_test.go @@ -81,6 +81,22 @@ func TestInitCmdBatchFlagFalse(t *testing.T) { } } +func TestInitCmdConfigDir(t *testing.T) { + _ = setupTestInitNGSI() + + f := configDirFlag.Copy(true) + err := f.SetValue("/tmp") + assert.NoError(t, err) + + c := &Context{Flags: []Flag{f}} + + ngsi, err := InitCmd(c) + + if assert.NoError(t, err) { + assert.Equal(t, "/tmp/ngsi-go-config.json", *ngsi.ConfigFile.FileName()) + } +} + func TestInitCmdConfig(t *testing.T) { _ = setupTestInitNGSI() @@ -130,6 +146,54 @@ func TestInitCmdinsecureSkipVerifyFlagTrue(t *testing.T) { } } +func TestInitCmdErrorConfigDirConfig(t *testing.T) { + _ = setupTestInitNGSI() + + var err error + + f1 := configDirFlag.Copy(true) + err = f1.SetValue("/tmp") + assert.NoError(t, err) + + f2 := configFlag.Copy(true) + err = f2.SetValue("config") + assert.NoError(t, err) + + c := &Context{Flags: []Flag{f1, f2}} + + _, err = InitCmd(c) + + if assert.Error(t, err) { + ngsiErr := err.(*ngsierr.NgsiError) + assert.Equal(t, 1, ngsiErr.ErrNo) + assert.Equal(t, "configDir cannot be specified with config or cache at the same time", ngsiErr.Message) + } +} + +func TestInitCmdErrorConfigDirCache(t *testing.T) { + _ = setupTestInitNGSI() + + var err error + + f1 := configDirFlag.Copy(true) + err = f1.SetValue("/tmp") + assert.NoError(t, err) + + f2 := cacheFlag.Copy(true) + err = f2.SetValue("config") + assert.NoError(t, err) + + c := &Context{Flags: []Flag{f1, f2}} + + _, err = InitCmd(c) + + if assert.Error(t, err) { + ngsiErr := err.(*ngsierr.NgsiError) + assert.Equal(t, 1, ngsiErr.ErrNo) + assert.Equal(t, "configDir cannot be specified with config or cache at the same time", ngsiErr.Message) + } +} + func TestInitCmdErrorInitConfig(t *testing.T) { ngsi := setupTestInitNGSI() @@ -140,7 +204,7 @@ func TestInitCmdErrorInitConfig(t *testing.T) { if assert.Error(t, err) { ngsiErr := err.(*ngsierr.NgsiError) - assert.Equal(t, 1, ngsiErr.ErrNo) + assert.Equal(t, 2, ngsiErr.ErrNo) assert.Equal(t, "InitConfig error", ngsiErr.Message) } } @@ -158,7 +222,7 @@ func TestInitCmdErrorInitStdErrOption(t *testing.T) { if assert.Error(t, err) { ngsiErr := err.(*ngsierr.NgsiError) - assert.Equal(t, 2, ngsiErr.ErrNo) + assert.Equal(t, 3, ngsiErr.ErrNo) assert.Equal(t, "stderr logLevel error", ngsiErr.Message) } } @@ -176,7 +240,7 @@ func TestInitCmdErrorInitSyslogOption(t *testing.T) { if assert.Error(t, err) { ngsiErr := err.(*ngsierr.NgsiError) - assert.Equal(t, 3, ngsiErr.ErrNo) + assert.Equal(t, 4, ngsiErr.ErrNo) assert.Equal(t, "syslog logLevel error", ngsiErr.Message) } } @@ -192,7 +256,7 @@ func TestInitCmdErrorInitTokenMgr(t *testing.T) { if assert.Error(t, err) { ngsiErr := err.(*ngsierr.NgsiError) - assert.Equal(t, 4, ngsiErr.ErrNo) + assert.Equal(t, 5, ngsiErr.ErrNo) assert.Equal(t, "InitTOkenMgr error", ngsiErr.Message) } } diff --git a/internal/ngsilib/config.go b/internal/ngsilib/config.go index fcac32de..fb3640a3 100644 --- a/internal/ngsilib/config.go +++ b/internal/ngsilib/config.go @@ -76,7 +76,7 @@ func initConfig(ngsi *NGSI, io IoLib) error { saveFlag := false if io.FileName() == nil { - home, err := getConfigDir(io) + home, err := getConfigDir(ngsi.ConfigDir, io) if err != nil { return ngsierr.New(funcName, 1, err.Error(), err) } diff --git a/internal/ngsilib/ngsilib.go b/internal/ngsilib/ngsilib.go index 0e5ecc41..63b8f20e 100644 --- a/internal/ngsilib/ngsilib.go +++ b/internal/ngsilib/ngsilib.go @@ -48,6 +48,7 @@ type NGSI struct { tokenList tokenInfoList contextList ContextsInfo + ConfigDir *string ConfigFile IoLib CacheFile IoLib StdReader io.Reader @@ -170,26 +171,34 @@ func (ngsi *NGSI) StdoutFlush() { } } -func getConfigDir(io IoLib) (string, error) { +func getConfigDir(configDir *string, io IoLib) (string, error) { const funcName = "getConfigDir" - var path string - home, err := io.UserHomeDir() - if err != nil { - return "", ngsierr.New(funcName, 1, err.Error(), err) - } - if gNGSI.OsType == "windows" { - path = io.Getenv("APPDATA") - if path == "" { - path = home - } - } else { - path, err = io.UserConfigDir() + var home string + + if configDir == nil { + var path string + var err error + + home, err = io.UserHomeDir() if err != nil { - path = io.FilePathJoin(home, ".config") + return "", ngsierr.New(funcName, 1, err.Error(), err) + } + if gNGSI.OsType == "windows" { + path = io.Getenv("APPDATA") + if path == "" { + path = home + } + } else { + path, err = io.UserConfigDir() + if err != nil { + path = io.FilePathJoin(home, ".config") + } } + home = io.FilePathJoin(path, "fiware") + } else { + home = *configDir } - home = io.FilePathJoin(path, "fiware") if !existsFile(io, home) { err := io.MkdirAll(home, 0700) if err != nil { diff --git a/internal/ngsilib/ngsilib_test.go b/internal/ngsilib/ngsilib_test.go index 2981d657..b6583d0a 100644 --- a/internal/ngsilib/ngsilib_test.go +++ b/internal/ngsilib/ngsilib_test.go @@ -137,11 +137,24 @@ func TestStdoutFlush(t *testing.T) { } +func TestGetConfigDirConfigDir(t *testing.T) { + testNgsiLibInit() + + configDir := "/tmp" + io := &MockIoLib{} + + dir, err := getConfigDir(&configDir, io) + + if assert.NoError(t, err) { + assert.Equal(t, "/tmp", dir) + } +} + func TestGetConfigDir(t *testing.T) { testNgsiLibInit() io := &MockIoLib{ConfigDir: "/home/ngsi/.config"} - dir, err := getConfigDir(io) + dir, err := getConfigDir(nil, io) if assert.NoError(t, err) { assert.Equal(t, "/home/ngsi/.config/fiware", dir) @@ -154,7 +167,7 @@ func TestGetConfigDirGetenv(t *testing.T) { ngsi.OsType = "windows" io := &MockIoLib{ConfigDir: "/home/ngsi/.config", Env: `C:\Users\`} - dir, err := getConfigDir(io) + dir, err := getConfigDir(nil, io) if assert.NoError(t, err) { assert.Equal(t, "C:\\Users\\/fiware", dir) @@ -167,7 +180,7 @@ func TestGetConfigDirGetenvNotFound(t *testing.T) { ngsi.OsType = "windows" io := &MockIoLib{ConfigDir: "/home/ngsi/.config", Env: ""} - dir, err := getConfigDir(io) + dir, err := getConfigDir(nil, io) if assert.NoError(t, err) { assert.Equal(t, "/fiware", dir) @@ -178,7 +191,7 @@ func TestGetConfigDirNotExists(t *testing.T) { testNgsiLibInit() io := &MockIoLib{ConfigDir: "/home/ngsi/.config", StatErr: errors.New("error")} - dir, err := getConfigDir(io) + dir, err := getConfigDir(nil, io) if assert.NoError(t, err) { assert.Equal(t, "/home/ngsi/.config/fiware", dir) @@ -189,7 +202,7 @@ func TestGetConfigDirErrorUserConfigDir(t *testing.T) { testNgsiLibInit() io := &MockIoLib{HomeDir: "/home/ngsi", ConfigDir: "/home/ngsi/.config", ConfigDirErr: errors.New("error")} - dir, err := getConfigDir(io) + dir, err := getConfigDir(nil, io) if assert.NoError(t, err) { assert.Equal(t, "/home/ngsi/.config/fiware", dir) @@ -200,7 +213,7 @@ func TestGetConfigDirErrorUserHomeDir(t *testing.T) { testNgsiLibInit() io := &MockIoLib{ConfigDir: "/home/ngsi/.config", HomeDirErr: errors.New("error homedir")} - _, err := getConfigDir(io) + _, err := getConfigDir(nil, io) if assert.Error(t, err) { ngsiErr := err.(*ngsierr.NgsiError) @@ -213,7 +226,7 @@ func TestGetConfigDirErrorMkdir(t *testing.T) { testNgsiLibInit() io := &MockIoLib{ConfigDir: "/home/ngsi/.config", StatErr: errors.New("error stat"), MkdirErr: errors.New("error mkdir")} - _, err := getConfigDir(io) + _, err := getConfigDir(nil, io) if assert.Error(t, err) { ngsiErr := err.(*ngsierr.NgsiError) diff --git a/internal/ngsilib/token_mgr.go b/internal/ngsilib/token_mgr.go index db32511a..055d2aca 100644 --- a/internal/ngsilib/token_mgr.go +++ b/internal/ngsilib/token_mgr.go @@ -140,7 +140,7 @@ func (ngsi *NGSI) InitTokenMgr(file *string) error { cacheFile := ngsi.CacheFile if file == nil { - home, err := getConfigDir(cacheFile) + home, err := getConfigDir(ngsi.ConfigDir, cacheFile) if err != nil { return ngsierr.New(funcName, 1, err.Error(), err) }