Skip to content

Commit 800802a

Browse files
sjkpsjkp
authored
Merge pull request #296 from sjkp/feature/deployfrom-zip
Feature/deployfrom zip
2 parents 7e51e56 + 31d8218 commit 800802a

File tree

15 files changed

+339
-149
lines changed

15 files changed

+339
-149
lines changed

‎LetsEncrypt-SiteExtension/Controllers/HomeController.cs‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using LetsEncrypt.Azure.Core;
22
using LetsEncrypt.Azure.Core.Models;
3+
using LetsEncrypt.Azure.Core.Services;
34
using LetsEncrypt.SiteExtension.Models;
45
using Microsoft.Azure.Management.WebSites;
56
using Microsoft.Azure.Management.WebSites.Models;
@@ -74,7 +75,9 @@ public async Task<ActionResult> Index(AuthenticationModel model)
7475
}
7576

7677
client.WebApps.UpdateSiteOrSlotAppSettings(model.ResourceGroupName, model.WebAppName, model.SiteSlotName, webappsettings);
77-
ConfigurationManager.RefreshSection("appSettings");
78+
ConfigurationManager.RefreshSection("appSettings");
79+
var path = new PathProvider(model);
80+
await path.ChallengeDirectory(true);
7881
}
7982
else
8083
{
@@ -122,13 +125,23 @@ private bool ValidateModelVsAppSettings(string name, string appSettingValue, str
122125
return true;
123126
}
124127

125-
public ActionResult PleaseWait()
128+
public async Task<ActionResult> PleaseWait()
126129
{
127130
var settings = new AppSettingsAuthConfig();
128131
List<ValidationResult> validationResult = null;
129132
if (settings.IsValid(out validationResult))
130133
{
131-
return RedirectToAction("Hostname");
134+
if (settings.RunFromPackage)
135+
{
136+
if (await new PathProvider(settings).IsVirtualDirectorySetup())
137+
{
138+
return RedirectToAction("Hostname");
139+
}
140+
}
141+
else
142+
{
143+
return RedirectToAction("Hostname");
144+
}
132145
}
133146

134147
return View();

‎LetsEncrypt-SiteExtension/Models/AuthenticationModel.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public bool UseIPBasedSSL
4646
get; set;
4747
}
4848

49-
[Display(Name = "Update Application Settings")]
49+
[Display(Name = "Update Application Settings and Virtual Application (if needed)")]
5050
public bool UpdateAppSettings
5151
{
5252
get;set;
@@ -92,6 +92,8 @@ public string WebRootPath
9292
get; set;
9393
}
9494

95+
public bool RunFromPackage { get; set; }
96+
9597
public static explicit operator AuthenticationModel(AppSettingsAuthConfig config)
9698
{
9799
return new AuthenticationModel()
@@ -109,7 +111,8 @@ public static explicit operator AuthenticationModel(AppSettingsAuthConfig config
109111
ManagementEndpoint = config.ManagementEndpoint,
110112
TokenAudience = config.TokenAudience,
111113
SiteSlotName = config.SiteSlotName,
112-
WebRootPath = config.WebRootPath
114+
WebRootPath = config.WebRootPath,
115+
RunFromPackage = config.RunFromPackage,
113116
};
114117
}
115118
}

‎LetsEncrypt-SiteExtension/Views/Home/Index.cshtml‎

Lines changed: 110 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
To automate the installation of Let's Encrypt SSL certificate on your Azure Web App, a few things need to be configured. The certificate is installed and renewed using the Azure Resource Manager API, because the renewal process should run unattended you need to register an Azure AD service principal that have access to at least the Azure Web App. Read more about how to register a service principal <a href="http://blogs.msdn.com/b/visualstudioalm/archive/2015/10/04/automating-azure-resource-group-deployment-using-a-service-principal-in-visual-studio-online-build-release-management.aspx">here</a>.
1111
</p>
1212
<p>
13-
Once you have registered a service principal, you should add the following App Setting, since the site extension reads them from there. You can register them manually or enter them below and check 'Update Web App Settings'.
13+
Once you have registered a service principal, you should add the following App Setting, since the site extension reads them from there. You can register them manually or enter them below and check 'Update Web App Settings'.
1414
</p>
1515
<table class="table table-striped">
1616
<thead>
1717
<tr>
18-
<th>Key</th><th>Value</th>
18+
<th>Key</th>
19+
<th>Value</th>
1920
</tr>
2021
</thead>
2122
<tbody>
@@ -93,126 +94,140 @@
9394
</tbody>
9495
</table>
9596
</div>
97+
98+
99+
96100
@using (Html.BeginForm())
97101
{
98102
@*@Html.AntiForgeryToken()*@
99103

104+
100105
@Html.HiddenFor(model => model.AuthenticationEndpoint)
101106
@Html.HiddenFor(model => model.AzureWebSitesDefaultDomainName)
102107
@Html.HiddenFor(model => model.ManagementEndpoint)
103108
@Html.HiddenFor(model => model.TokenAudience)
109+
@Html.HiddenFor(model => model.RunFromPackage)
110+
111+
<div class="form-horizontal">
112+
<hr />
113+
114+
@if (Model.RunFromPackage && string.IsNullOrEmpty(Environment.GetEnvironmentVariable(LetsEncrypt.Azure.Core.Models.AppSettingsAuthConfig.webRootPath)))
115+
{
116+
<div class="alert alert-warning" role="alert">
117+
<p>Web Site was deployed using "Run From Package", the site extension will have to configure a virtual application to ensure the challenge file can be browsable at http://your-site/.well-known/acme-challenge. </p>
104118
105-
<div class="form-horizontal">
106-
<hr />
107-
@Html.ValidationSummary(true, "", new { @class = "text-danger" })
108-
@{
109-
var authModel = (Model as LetsEncrypt.SiteExtension.Models.AuthenticationModel);
110-
}
111-
@if (authModel != null && authModel.Error)
112-
{
113-
<div class="alert alert-danger" role="alert">
114-
@authModel.ErrorMessage
115-
</div>
116-
}
117-
<div class="form-group">
118-
@Html.LabelFor(model => model.Tenant, htmlAttributes: new { @class = "control-label col-md-2" })
119-
<div class="col-md-10">
120-
@Html.EditorFor(model => model.Tenant, new { htmlAttributes = new { @class = "form-control" } })
121-
@Html.ValidationMessageFor(model => model.Tenant, "", new { @class = "text-danger" })
122-
</div>
119+
<p>If you already host content under /.well-known then you should not continue, instead you should follow the manual setup procedure at <a href="https://github.com/sjkp/letsencrypt-siteextension/wiki/Run-From-Package">https://github.com/sjkp/letsencrypt-siteextension/wiki/Run-From-Package</a></p>
120+
</div>
121+
}
122+
@Html.ValidationSummary(true, "", new { @class = "text-danger" })
123+
@{
124+
var authModel = (Model as LetsEncrypt.SiteExtension.Models.AuthenticationModel);
125+
}
126+
@if (authModel != null && authModel.Error)
127+
{
128+
<div class="alert alert-danger" role="alert">
129+
@authModel.ErrorMessage
130+
</div>
131+
}
132+
<div class="form-group">
133+
@Html.LabelFor(model => model.Tenant, htmlAttributes: new { @class = "control-label col-md-2" })
134+
<div class="col-md-10">
135+
@Html.EditorFor(model => model.Tenant, new { htmlAttributes = new { @class = "form-control" } })
136+
@Html.ValidationMessageFor(model => model.Tenant, "", new { @class = "text-danger" })
123137
</div>
138+
</div>
124139

125-
<div class="form-group">
126-
@Html.LabelFor(model => model.SubscriptionId, htmlAttributes: new { @class = "control-label col-md-2" })
127-
<div class="col-md-10">
128-
@Html.EditorFor(model => model.SubscriptionId, new { htmlAttributes = new { @class = "form-control" } })
129-
@Html.ValidationMessageFor(model => model.SubscriptionId, "", new { @class = "text-danger" })
130-
</div>
140+
<div class="form-group">
141+
@Html.LabelFor(model => model.SubscriptionId, htmlAttributes: new { @class = "control-label col-md-2" })
142+
<div class="col-md-10">
143+
@Html.EditorFor(model => model.SubscriptionId, new { htmlAttributes = new { @class = "form-control" } })
144+
@Html.ValidationMessageFor(model => model.SubscriptionId, "", new { @class = "text-danger" })
131145
</div>
146+
</div>
132147

133-
<div class="form-group">
134-
@Html.LabelFor(model => model.ClientId, htmlAttributes: new { @class = "control-label col-md-2" })
135-
<div class="col-md-10">
136-
@Html.EditorFor(model => model.ClientId, new { htmlAttributes = new { @class = "form-control" } })
137-
@Html.ValidationMessageFor(model => model.ClientId, "", new { @class = "text-danger" })
138-
</div>
148+
<div class="form-group">
149+
@Html.LabelFor(model => model.ClientId, htmlAttributes: new { @class = "control-label col-md-2" })
150+
<div class="col-md-10">
151+
@Html.EditorFor(model => model.ClientId, new { htmlAttributes = new { @class = "form-control" } })
152+
@Html.ValidationMessageFor(model => model.ClientId, "", new { @class = "text-danger" })
139153
</div>
154+
</div>
140155

141-
<div class="form-group">
142-
@Html.LabelFor(model => model.ClientSecret, htmlAttributes: new { @class = "control-label col-md-2" })
143-
<div class="col-md-10">
144-
@Html.EditorFor(model => model.ClientSecret, new { htmlAttributes = new { @class = "form-control" } })
145-
@Html.ValidationMessageFor(model => model.ClientSecret, "", new { @class = "text-danger" })
146-
</div>
156+
<div class="form-group">
157+
@Html.LabelFor(model => model.ClientSecret, htmlAttributes: new { @class = "control-label col-md-2" })
158+
<div class="col-md-10">
159+
@Html.EditorFor(model => model.ClientSecret, new { htmlAttributes = new { @class = "form-control" } })
160+
@Html.ValidationMessageFor(model => model.ClientSecret, "", new { @class = "text-danger" })
147161
</div>
162+
</div>
148163

149-
<div class="form-group">
150-
@Html.LabelFor(model => model.ResourceGroupName, htmlAttributes: new { @class = "control-label col-md-2" })
151-
<div class="col-md-10">
152-
@Html.EditorFor(model => model.ResourceGroupName, new { htmlAttributes = new { @class = "form-control" } })
153-
@Html.ValidationMessageFor(model => model.ResourceGroupName, "", new { @class = "text-danger" })
154-
</div>
164+
<div class="form-group">
165+
@Html.LabelFor(model => model.ResourceGroupName, htmlAttributes: new { @class = "control-label col-md-2" })
166+
<div class="col-md-10">
167+
@Html.EditorFor(model => model.ResourceGroupName, new { htmlAttributes = new { @class = "form-control" } })
168+
@Html.ValidationMessageFor(model => model.ResourceGroupName, "", new { @class = "text-danger" })
155169
</div>
170+
</div>
156171

157-
<div class="form-group">
158-
@Html.LabelFor(model => model.ServicePlanResourceGroupName, htmlAttributes: new { @class = "control-label col-md-2" })
159-
<div class="col-md-10">
160-
@Html.EditorFor(model => model.ServicePlanResourceGroupName, new { htmlAttributes = new { @class = "form-control" } })
161-
@Html.ValidationMessageFor(model => model.ServicePlanResourceGroupName, "", new { @class = "text-danger" })
162-
</div>
172+
<div class="form-group">
173+
@Html.LabelFor(model => model.ServicePlanResourceGroupName, htmlAttributes: new { @class = "control-label col-md-2" })
174+
<div class="col-md-10">
175+
@Html.EditorFor(model => model.ServicePlanResourceGroupName, new { htmlAttributes = new { @class = "form-control" } })
176+
@Html.ValidationMessageFor(model => model.ServicePlanResourceGroupName, "", new { @class = "text-danger" })
163177
</div>
164-
<div class="form-group">
165-
@Html.LabelFor(model => model.UseIPBasedSSL, htmlAttributes: new { @class = "control-label col-md-2" })
166-
<div class="col-md-10">
167-
@Html.EditorFor(model => model.UseIPBasedSSL, new { htmlAttributes = new { @class = "form-control" } })
168-
@Html.ValidationMessageFor(model => model.UseIPBasedSSL, "", new { @class = "text-danger" })
169-
</div>
178+
</div>
179+
<div class="form-group">
180+
@Html.LabelFor(model => model.UseIPBasedSSL, htmlAttributes: new { @class = "control-label col-md-2" })
181+
<div class="col-md-10">
182+
@Html.EditorFor(model => model.UseIPBasedSSL, new { htmlAttributes = new { @class = "form-control" } })
183+
@Html.ValidationMessageFor(model => model.UseIPBasedSSL, "", new { @class = "text-danger" })
170184
</div>
185+
</div>
171186

172-
<div class="form-group">
173-
@Html.LabelFor(model => model.WebAppName, htmlAttributes: new { @class = "control-label col-md-2" })
174-
<div class="col-md-10">
175-
@Html.EditorFor(model => model.WebAppName, new { htmlAttributes = new { @class = "form-control", @readonly = "readonly" } })
176-
@Html.ValidationMessageFor(model => model.WebAppName, "", new { @class = "text-danger" })
177-
</div>
178-
</div>
179-
<div class="form-group">
180-
@Html.LabelFor(model => model.SiteSlotName, htmlAttributes: new { @class = "control-label col-md-2" })
181-
<div class="col-md-10">
182-
@Html.EditorFor(model => model.SiteSlotName, new { htmlAttributes = new { @class = "form-control" } })
183-
@Html.ValidationMessageFor(model => model.SiteSlotName, "", new { @class = "text-danger" })
184-
</div>
187+
<div class="form-group">
188+
@Html.LabelFor(model => model.WebAppName, htmlAttributes: new { @class = "control-label col-md-2" })
189+
<div class="col-md-10">
190+
@Html.EditorFor(model => model.WebAppName, new { htmlAttributes = new { @class = "form-control", @readonly = "readonly" } })
191+
@Html.ValidationMessageFor(model => model.WebAppName, "", new { @class = "text-danger" })
185192
</div>
186-
<div class="form-group">
187-
@Html.LabelFor(model => model.UpdateAppSettings, htmlAttributes: new { @class = "control-label col-md-2" })
188-
<div class="col-md-10">
189-
@Html.EditorFor(model => model.UpdateAppSettings, new { htmlAttributes = new { @class = "form-control" } })
190-
<span class="text-danger" id="showwarning" style="display:none;">WARNING WEBSITE WILL RESTART.</span>
191-
@Html.ValidationMessageFor(model => model.UpdateAppSettings, "", new { @class = "text-danger" })
192-
</div>
193+
</div>
194+
<div class="form-group">
195+
@Html.LabelFor(model => model.SiteSlotName, htmlAttributes: new { @class = "control-label col-md-2" })
196+
<div class="col-md-10">
197+
@Html.EditorFor(model => model.SiteSlotName, new { htmlAttributes = new { @class = "form-control" } })
198+
@Html.ValidationMessageFor(model => model.SiteSlotName, "", new { @class = "text-danger" })
193199
</div>
194200
</div>
195-
<div class="form-horizontal">
196-
<input type="submit" value="Next" class="btn btn-primary pull-right" />
197-
<br />
198-
<br />
201+
<div class="form-group">
202+
@Html.LabelFor(model => model.UpdateAppSettings, htmlAttributes: new { @class = "control-label col-md-2" })
203+
<div class="col-md-10">
204+
@Html.EditorFor(model => model.UpdateAppSettings, new { htmlAttributes = new { @class = "form-control" } })
205+
<span class="text-danger" id="showwarning" style="display:none;">WARNING WEBSITE WILL RESTART.</span>
206+
@Html.ValidationMessageFor(model => model.UpdateAppSettings, "", new { @class = "text-danger" })
207+
</div>
199208
</div>
200-
}
209+
</div>
210+
<div class="form-horizontal">
211+
<input type="submit" value="Next" class="btn btn-primary pull-right" />
212+
<br />
213+
<br />
214+
</div>
215+
}
201216

202217
<div>
203218
</div>
204219
@section scripts {
205-
$(function () {
206-
$('#UpdateAppSettings').change(function () {
207-
if (this.checked)
208-
{
209-
$('#showwarning').show();
210-
} else {
211-
$('#showwarning').hide();
212-
}
213-
});
214-
$('#automatedInstallHeader').click(function () {
215-
$('#automatedInstall').toggle();
216-
});
217-
});
218-
}
220+
$(function () {
221+
$('#UpdateAppSettings').change(function () {
222+
if (this.checked)
223+
{
224+
$('#showwarning').show();
225+
} else {
226+
$('#showwarning').hide();
227+
}
228+
});
229+
$('#automatedInstallHeader').click(function () {
230+
$('#automatedInstall').toggle();
231+
});
232+
});
233+
}

‎LetsEncrypt-SiteExtension/Web.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<add key="letsencrypt:ClientSecret" value="" />
2323
<add key="letsencrypt:ClientId" value="7f257375-267c-4431-afe0-12e4bcf4ab17" />
2424
<add key="WEBSITE_SITE_NAME" value="webAppcfmv5fy7lcq7o" />
25+
<add key="WEBSITE_RUN_FROM_PACKAGE" value="1"/>
2526
</appSettings>
2627
<!--
2728
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.

‎LetsEncrypt.ResourceGroup/Templates/azuredeploy.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,13 @@
9898
"metadata": {
9999
"description": "Url for the nuget feed to download site-extensions from, per default you don't need to change this. Used for overriding with private feed for testing prerelease versions"
100100
}
101+
},
102+
"runFromPackage": {
103+
"type": "string",
104+
"defaultValue": "0",
105+
"metadata": {
106+
"description": "Set this to a url for a deployment package or 1 and dump a package in d:\\home\\data\\SitePackages, together with a packagename.txt file which contains the filename of the package in the folder"
107+
}
101108
}
102109
},
103110
"variables": {
@@ -164,7 +171,8 @@
164171
"letsencrypt:AzureTokenAudience": "[parameters('tokenAudience')]",
165172
"letsencrypt:AzureManagementEndpoint": "[parameters('managementEndpoint')]",
166173
"letsencrypt:AzureDefaultWebSiteDomainName": "[parameters('webSitesDefaultDomainName')]",
167-
"SCM_SITEEXTENSIONS_FEED_URL ": "[parameters('siteExtensionFeedUrl')]"
174+
"SCM_SITEEXTENSIONS_FEED_URL ": "[parameters('siteExtensionFeedUrl')]",
175+
"WEBSITE_RUN_FROM_PACKAGE": "[parameters('runFromPackage')]"
168176
}
169177
},
170178
{

0 commit comments

Comments
 (0)