diff options
| author | Wouter Tinus <wouter.tinus@gmail.com> | 2020-06-08 20:44:45 +0200 |
|---|---|---|
| committer | Wouter Tinus <wouter.tinus@gmail.com> | 2020-06-08 20:44:45 +0200 |
| commit | 46ddef738ef89ecc11c706a103bc09b235165993 (patch) | |
| tree | 51c97a716f085f6f0e2ecc64e8a82d2208941ccc | |
| parent | b8430b53e8bdccb441508817108c94fb10674610 (diff) | |
| download | letsencrypt-win-simple-46ddef738ef89ecc11c706a103bc09b235165993.zip letsencrypt-win-simple-46ddef738ef89ecc11c706a103bc09b235165993.tar.gz letsencrypt-win-simple-46ddef738ef89ecc11c706a103bc09b235165993.tar.bz2 | |
respect command line
| -rw-r--r-- | src/main.lib/Plugins/Resolvers/InteractiveResolver.cs | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/main.lib/Plugins/Resolvers/InteractiveResolver.cs b/src/main.lib/Plugins/Resolvers/InteractiveResolver.cs index 257e88d..dc96981 100644 --- a/src/main.lib/Plugins/Resolvers/InteractiveResolver.cs +++ b/src/main.lib/Plugins/Resolvers/InteractiveResolver.cs @@ -185,6 +185,16 @@ namespace PKISharp.WACS.Plugins.Resolvers /// <returns></returns> public override async Task<IValidationPluginOptionsFactory> GetValidationPlugin(ILifetimeScope scope, Target target) { + var defaultParam1 = _settings.Validation.DefaultValidation; + var defaultParam2 = _settings.Validation.DefaultValidationMode ?? Constants.Http01ChallengeType; + if (!string.IsNullOrWhiteSpace(_arguments.MainArguments.Validation)) + { + defaultParam1 = _arguments.MainArguments.Validation; + } + if (!string.IsNullOrWhiteSpace(_arguments.MainArguments.ValidationMode)) + { + defaultParam2 = _arguments.MainArguments.ValidationMode; + } return await GetPlugin<IValidationPluginOptionsFactory>( scope, sort: x => @@ -203,8 +213,8 @@ namespace PKISharp.WACS.Plugins.Resolvers ThenBy(x => x.Description), unusable: x => (!x.CanValidate(target), "Unsuppored target. Most likely this is because you have included a wildcard identifier (*.example.com), which requires DNS validation."), description: x => $"[{x.ChallengeType}] {x.Description}", - defaultParam1: _settings.Validation.DefaultValidation, - defaultParam2: _settings.Validation.DefaultValidationMode ?? Constants.Http01ChallengeType, + defaultParam1: defaultParam1, + defaultParam2: defaultParam2, defaultType: typeof(SelfHostingOptionsFactory), defaultTypeFallback: typeof(FileSystemOptionsFactory), nullResult: new NullValidationFactory(), @@ -250,6 +260,10 @@ namespace PKISharp.WACS.Plugins.Resolvers defaultType = typeof(NullStoreOptionsFactory); } var defaultParam1 = _settings.Store.DefaultStore; + if (!string.IsNullOrWhiteSpace(_arguments.MainArguments.Store)) + { + defaultParam1 = _arguments.MainArguments.Store; + } var csv = defaultParam1.ParseCsv(); defaultParam1 = csv?.Count > chosen.Count() ? csv[chosen.Count()] : @@ -292,6 +306,10 @@ namespace PKISharp.WACS.Plugins.Resolvers defaultType = typeof(NullInstallationOptionsFactory); } var defaultParam1 = _settings.Installation.DefaultInstallation; + if (!string.IsNullOrWhiteSpace(_arguments.MainArguments.Installation)) + { + defaultParam1 = _arguments.MainArguments.Installation; + } var csv = defaultParam1.ParseCsv(); defaultParam1 = csv?.Count > chosen.Count() ? csv[chosen.Count()] : |