Merge pull request #6 from shibayan/feature/container-app

Support Web App for Containers
shibayan · Aug 11, 2018 · 4ed0b6b · 4ed0b6b
2 parents 2f33e50 + 4e8c9fe
commit 4ed0b6b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/AzureLetsEncrypt/AddCertificate.cs b/AzureLetsEncrypt/AddCertificate.cs
@@ -34,23 +34,23 @@ public static async Task RunOrchestrator([OrchestrationTrigger] DurableOrchestra
                 return;
             }
 
-            await context.CallActivityAsync(nameof(SharedFunctions.UpdateSettings), site);
-
             // 新しく ACME Order を作成する
             var orderDetails = await context.CallActivityAsync<OrderDetails>(nameof(SharedFunctions.Order), hostNameSslState.Name);
 
             // 複数の Authorizations には未対応
             var authzUrl = orderDetails.Payload.Authorizations.First();
 
             // ACME Challenge を実行
-            if (hostNameSslState.Name.StartsWith("*"))
+            if (hostNameSslState.Name.StartsWith("*") || site.Kind.Contains("container") || site.Kind.Contains("linux"))
             {
-                // ワイルドカードの場合は DNS-01 を利用する
+                // ワイルドカード、コンテナ、Linux の場合は DNS-01 を利用する
                 await context.CallActivityAsync(nameof(SharedFunctions.Dns01Authorization), (site, hostNameSslState.Name, authzUrl));
             }
             else
             {
                 // それ以外は HTTP-01 を利用する
+                await context.CallActivityAsync(nameof(SharedFunctions.UpdateSettings), site);
+
                 await context.CallActivityAsync(nameof(SharedFunctions.Http01Authorization), (site, authzUrl));
             }
 

diff --git a/AzureLetsEncrypt/RenewCertificates.cs b/AzureLetsEncrypt/RenewCertificates.cs
@@ -66,14 +66,16 @@ public static async Task RenewSiteCertificates([OrchestrationTrigger] DurableOrc
                 var authzUrl = orderDetails.Payload.Authorizations.First();
 
                 // ACME Challenge を実行
-                if (hostNameSslState.Name.StartsWith("*"))
+                if (hostNameSslState.Name.StartsWith("*") || site.Kind.Contains("container") || site.Kind.Contains("linux"))
                 {
-                    // ワイルドカードの場合は DNS-01 を利用する
+                    // ワイルドカード、コンテナ、Linux の場合は DNS-01 を利用する
                     await context.CallActivityAsync(nameof(SharedFunctions.Dns01Authorization), (site, hostNameSslState.Name, authzUrl));
                 }
                 else
                 {
                     // それ以外は HTTP-01 を利用する
+                    await context.CallActivityAsync(nameof(SharedFunctions.UpdateSettings), site);
+
                     await context.CallActivityAsync(nameof(SharedFunctions.Http01Authorization), (site, authzUrl));
                 }