jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

volumes: fixes for ext4

Browse Source
This commit is contained in:
Girish Ramakrishnan
2021-06-18 23:03:18 -07:00
parent a2f1a1feb3
commit e614703305
9 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/backups.html
+2 -2
View File
@@ -133,7 +133,7 @@
<!-- SSHFS/CIFS/NFS/mountpoint/ext4 -->
<div class="form-group" ng-class="{ 'has-error': configureBackup.error.mountPoint || (configureBackupForm.mountPoint.$dirty && !configureBackup.mountPoint) }" ng-show="mountlike(configureBackup.provider)">
<label class="control-label" for="inputConfigureMountPoint">{{ 'backups.configureBackupStorage.mountPoint' | tr }}</label>
<input type="text" class="form-control" ng-model="configureBackup.mountPoint" id="inputConfigureMountPoint" name="mountPoint" ng-disabled="configureBackup.busy" placeholder="Folder where filesystem is mounted" ng-required="mountlike(configureBackup.provider)">
<input type="text" class="form-control" ng-model="configureBackup.mountPoint" id="inputConfigureMountPoint" name="mountPoint" ng-disabled="configureBackup.busy" placeholder="/mnt/backups" ng-required="mountlike(configureBackup.provider)">
<p ng-show="configureBackup.provider === 'mointpoint'" ng-bind-html="'backups.configureBackupStorage.mountPointDescription' | tr:{ providerDocsLink: 'https://docs.cloudron.io/backups/#'+configureBackup.provider }"></p>
</div>
@@ -164,7 +164,7 @@
<!-- EXT4 -->
<div class="form-group" ng-class="{ 'has-error': configureBackup.error.diskPath || !configureBackup.diskPath }" ng-show="configureBackup.provider === 'ext4'">
<label class="control-label" for="inputConfigureDiskPath">{{ 'backups.configureBackupStorage.diskPath' | tr }}</label>
<input type="text" class="form-control" ng-model="configureBackup.mountOptions.diskPath" id="inputConfigureDiskPath" name="diskPath" ng-disabled="configureBackup.busy" placeholder="Directory for backups" ng-required="configureBackup.provider === 'ext4'">
<input type="text" class="form-control" ng-model="configureBackup.mountOptions.diskPath" id="inputConfigureDiskPath" name="diskPath" ng-disabled="configureBackup.busy" placeholder="/dev/disk/by-uuid/uuid" ng-required="configureBackup.provider === 'ext4'">
</div>
<!-- SSHFS -->
src/views/backups.js
+1 -1
View File
@@ -623,7 +623,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
backupConfig.mountOptions.privateKey = $scope.configureBackup.mountOptions.privateKey;
}
} else if (backupConfig.provider === 'ext4') {
backupConfig.mountOptions.diskPath = $scope.configureBackup.diskPath;
backupConfig.mountOptions.diskPath = $scope.configureBackup.mountOptions.diskPath;
}
} else if (backupConfig.provider === 'filesystem' || backupConfig.provider === 'mountpoint') {
backupConfig.backupFolder = $scope.configureBackup.backupFolder;
src/views/volumes.html
+6 -6
View File
@@ -17,12 +17,6 @@
<input type="text" class="form-control" ng-model="volumeConfigure.name" name="name" ng-disabled="volumeConfigure.busy" autofocus>
</div>
<div class="form-group">
<label class="control-label">{{ 'volumes.hostPath' | tr }}</label>
<input type="text" class="form-control" ng-model="volumeConfigure.hostPath" name="hostPath" ng-show="volumeConfigure.adding" ng-disabled="volumeConfigure.busy" autofocus>
<p ng-hide="volumeConfigure.adding">{{ volumeConfigure.volume.hostPath }}</p>
</div>
<div class="form-group" ng-hide="volumeConfigure.adding">
<label class="control-label">{{ 'volumes.mountStatus' | tr }}</label>
<p ng-class="volumeConfigure.volume.status.state === 'active' ? 'text-success' : 'text-danger'">{{ volumeConfigure.volume.status.message }} ({{ volumeConfigure.volume.status.state }})</p>
@@ -35,6 +29,12 @@
<p class="small text-info" ng-hide="volumeConfigure.mountType === 'noop'" ng-bind-html="'volumes.addVolumeDialog.mountTypeInfo' | tr"></p>
</div>
<div class="form-group">
<label class="control-label">{{ 'volumes.hostPath' | tr }}</label>
<input type="text" class="form-control" ng-model="volumeConfigure.hostPath" name="hostPath" ng-show="volumeConfigure.adding" ng-disabled="volumeConfigure.busy" placeholder="/mnt/data" autofocus>
<p ng-hide="volumeConfigure.adding">{{ volumeConfigure.volume.hostPath }}</p>
</div>
<div uib-collapse="volumeConfigure.mountType === 'noop'">
<div class="form-group" ng-show="volumeConfigure.mountType === 'ext4'">
<label class="control-label" for="volumeConfigureHost">{{ 'volumes.addVolumeDialog.diskPath' | tr }}</label>