enabled save button for empty customization blocks for nginx config to allow reverting from custom to default. Also added nginx-shared directory to allow users to share files with nginx (can be custom SSL certs, custom static files and etc.)

This commit is contained in:
Kasra Bigdeli
2017-12-30 18:00:02 -08:00
parent 9b58f290cb
commit 741da349bf
4 changed files with 15 additions and 2 deletions
+1 -1
View File
@@ -143,7 +143,7 @@
Load Default and Edit</button>
<div class="pull-right">
<button type="submit" ng-disabled="!nginxConfig.baseConfig.customValue && !nginxConfig.captainConfig.customValue " class="btn btn-primary" ng-click="onUpdateNginxConfigClicked()">
<button type="button" class="btn btn-primary" ng-click="onUpdateNginxConfigClicked()">
<span>
<i class="fa fa-refresh"></i>
</span> &nbsp; Save and Update</button>
@@ -378,6 +378,11 @@ class LoadBalancerManager {
return fs.ensureDir(CaptainConstants.letsEncryptEtcPath);
})
.then(function () {
return fs.ensureDir(CaptainConstants.nginxSharedPathOnHost);
})
.then(function () {
@@ -449,6 +454,10 @@ class LoadBalancerManager {
{
containerPath: CaptainConstants.letsEncryptEtcPathOnNginx,
hostPath: CaptainConstants.letsEncryptEtcPath
},
{
containerPath: CaptainConstants.nginxSharedPathOnNginx,
hostPath: CaptainConstants.nginxSharedPathOnHost
}
], [CaptainConstants.captainNetworkName]);
@@ -96,8 +96,12 @@ let data = {
registryAuthPathOnHost: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/registry-auth', // this is a file
nginxSharedPathOnHost: CAPTAIN_ROOT_DIRECTORY + '/nginx-shared',
letsEncryptEtcPathOnNginx: '/letencrypt/etc',
nginxSharedPathOnNginx: '/nginx-shared',
captainStaticFilesDir: CAPTAIN_ROOT_DIRECTORY_GENERATED + '/static',
captainRawImagesDir: CAPTAIN_ROOT_DIRECTORY_TEMP + '/img_raw',
+1 -1
View File
@@ -146,7 +146,7 @@
Load Default and Edit</button>
<div class="pull-right">
<button type="submit" ng-disabled="!nginxConfig.baseConfig.customValue && !nginxConfig.captainConfig.customValue " class="btn btn-primary"
<button type="button" class="btn btn-primary"
ng-click="onUpdateNginxConfigClicked()">
<span>
<i class="fa fa-refresh"></i>