diff options
| author | ramon <ramongomez@us.es> | 2017-10-13 11:00:17 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2017-10-13 11:00:17 +0000 |
| commit | 9d773c02981d74ff37eeb51c24f1240c689d1e96 (patch) | |
| tree | c3d84ee7b9fe2bfd8cd3fcbc54a80d558bda4f9f | |
| parent | e9182dcff638780e830016516b6d9a56e0dc3e12 (diff) | |
#810: Indicar si existen backups de imágenes en ruta RREST {{{/repository/images}}}.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5460 a21b9725-9963-47de-94b9-378ad31fedc9
| -rw-r--r-- | admin/WebConsole/rest/opengnsys-api.yml | 12 | ||||
| -rw-r--r-- | admin/WebConsole/rest/repository.php | 7 | ||||
| -rwxr-xr-x | repoman/bin/checkrepo | 3 |
3 files changed, 19 insertions, 3 deletions
diff --git a/admin/WebConsole/rest/opengnsys-api.yml b/admin/WebConsole/rest/opengnsys-api.yml index e37559d5..34b44752 100644 --- a/admin/WebConsole/rest/opengnsys-api.yml +++ b/admin/WebConsole/rest/opengnsys-api.yml @@ -1197,7 +1197,7 @@ definitions: description: image name (file name without extension) type: string type: - description: image type (file extension or ''dir'' for directory image) + description: image type (file extension or `dir` for directory image) type: string clientname: description: source client name @@ -1226,5 +1226,13 @@ definitions: mode: description: image access permissions (four octal digits) type: string - required: [ name, type, clientname, clonator, compressor, filesystem, datasize, size, modified, mode ] + backedup: + description: image backed up flag (check if `.ant` file exists) + type: boolean + default: false + backupsize: + description: image backup size (bytes) + type: integer + format: int64 + required: [ name, type, clientname, clonator, compressor, filesystem, datasize, size, modified, mode, backedup ] diff --git a/admin/WebConsole/rest/repository.php b/admin/WebConsole/rest/repository.php index e5ce76bd..3acb4230 100644 --- a/admin/WebConsole/rest/repository.php +++ b/admin/WebConsole/rest/repository.php @@ -97,6 +97,13 @@ $app->get('/repository/images(/)', 'validateRepositoryApiKey', $response['images'][$i]['size'] = @stat($file)['size']; $response['images'][$i]['modified'] = date("Y-m-d H:i:s", @stat($file)['mtime']); $response['images'][$i]['mode'] = substr(decoct(@stat($file)['mode']), -4); + $backupfile = $file.".ant"; + if (file_exists($backupfile)) { + $response['images'][$i]['backedup'] = true; + $response['images'][$i]['backupsize'] = @stat($backupfile)['size']; + } else { + $response['images'][$i]['backedup'] = false; + } } // Complete image in OUs information. for ($j=0; $j<sizeof(@$response['ous']); $j++) { diff --git a/repoman/bin/checkrepo b/repoman/bin/checkrepo index 40643931..822ae20a 100755 --- a/repoman/bin/checkrepo +++ b/repoman/bin/checkrepo @@ -153,6 +153,7 @@ function checkfiles() { # Retrieve image creation data and delete temporary file. INFO="$IMG.info" [ -e "$INFO" -a "$INFO" -ot "$IMG" ] && rm -f "$INFO" && echo "Warning: Deleted outdated file $INFO" + DATA="" [ -r "$INFO" ] && DATA=$(cat "$INFO") # Add data to configuration file (name, type and data) and remove image info file. IMG=${IMG#$IMAGESDIR/} @@ -170,7 +171,7 @@ function checkdirs() { IMG="$(dirname "${INFO#$IMAGESDIR/}")" # Skip repository root directory and locked images. [ "$IMG" == "$IMAGESDIR" -o -e "$IMG.lock" ] && continue - DATA=$(awk -F= '$1=="# fstype" {fs=$2} $1=="# sizedata" {sz=$2} END {printf "::%s:%s:",fs,sz}' "$INFO") + DATA=$(awk -F= '$1=="# fstype" {fs=$2} $1=="# sizedata" {sz=$2} END {printf "rsync::%s:%s:",fs,sz}' "$INFO") # Add data to configuration file (name, type and data). addToJson "$IMG" "dir" "$DATA" done |