github-personal/labca
1
0
Fork 0
mirror of https://github.com/outbackdingo/labca.git synced 2026-01-27 10:19:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make backup files downloadable (#44)

Browse Source
This commit is contained in:
Arjan H
2022-04-23 10:39:45 +02:00
parent 9e411e03b5
commit b9a35633d9
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backup
View File

@@ -2,14 +2,14 @@
set -e
NOW=$(date +%y%m%d%H%M%S)
NOW=$(date +%y%m%d-%H%M%S)
CRON=""
if [ "$1" == "cron" ]; then
CRON="${1}_"
CRON="_${1}"
TODAY=`date '+%Y_%m_%d'`
echo "Running cron-$(basename $0) for ${TODAY}..."
fi
BASE=${HOSTNAME}_${CRON}${NOW}
BASE=${NOW}_${HOSTNAME}${CRON}
TMPDIR=/tmp/$BASE
mkdir -p $TMPDIR
mkdir -p /backup

2
gui/main.go
View File

@@ -2459,6 +2459,8 @@ func main() {
r.HandleFunc("/certificates/{id}", certificateHandler).Methods("GET")
r.HandleFunc("/certificates/{id}", certRevokeHandler).Methods("POST")
r.PathPrefix("/backup/").Handler(http.StripPrefix("/backup/", http.FileServer(http.Dir("/backup"))))
r.NotFoundHandler = http.HandlerFunc(notFoundHandler)
if isDev {
r.PathPrefix("/accounts/static/").Handler(http.StripPrefix("/accounts/static/", http.FileServer(http.Dir("../static"))))

15
gui/templates/views/manage.tmpl
View File

@@ -72,7 +72,7 @@
<tbody id="backups-tbody">
{{ range .BackupFiles }}
<tr>
<td class="vmiddle">{{ . }}</td>
<td class="vmiddle"><a href="/admin/backup/{{.}}" class="backupdl">{{.}}</a></td>
<td class="vmiddle">
<button class="btn btn-outline btn-warning backup-restore" type="button" title="Restore this backup">Restore</button>
<button class="btn btn-outline btn-danger backup-delete" type="button" title="Delete this backup">Delete</button>
@@ -86,8 +86,8 @@
</div>
<div class="col-lg-6 col-md-9 col-sm-12">
<div class="well">
Backups are automatically created once a week. Here you can manually create extra backups, delete
backups or restore a selected backup.<br/> After restoring the services will be <b>automatically restarted</b>.<br/>
Backups are automatically created once a week. Here you can manually create extra backups and download, delete
or restore a selected backup.<br/> After restoring the services will be <b>automatically restarted</b>.<br/>
Automatic backups are removed after one month, manual backups are kept until manually deleted.
</div>
</div>
@@ -294,6 +294,13 @@
}, 250);
});
$(".backupdl").click(function(evt) {
if (!window.confirm("WARNING: this backup file contains the private keys and other sensitive data in unprotected form. You should be very careful where you store it. Do you want to continue?")) {
return false;
}
});
$(".btn").click(function(evt) {
$('#modal-spinner').modal('show');
if ($(evt.target).hasClass('btn-warning') || $(evt.target).hasClass('btn-danger')) {
@@ -329,7 +336,7 @@
var msg = "Successfully created backup";
$("#backup-result").removeClass("hidden").removeClass("error").show().text(msg).addClass("success");
$("#backups-tbody").append('<tr><td class="vmiddle">' + data.Message + '</td><td class="vmiddle"></td></tr>');
$("#backups-tbody").append('<tr><td class="vmiddle"><a href="/admin/backup/' + data.Message + '" class="backupdl">' + data.Message + '</a></td><td class="vmiddle"></td></tr>');
} else {
$("#backup-result").removeClass("hidden").removeClass("success").show().text(data.Message).addClass("error");

3
patches/docker-compose.patch
View File

@@ -50,7 +50,7 @@ index b7e5656c5..3b82e8651 100644
networks:
bluenet:
aliases:
@@ -56,21 +65,72 @@ services:
@@ -56,21 +65,73 @@ services:
# small.
command: mysqld --bind-address=0.0.0.0 --slow-query-log --log-output=TABLE --log-queries-not-using-indexes=ON
logging:
@@ -71,6 +71,7 @@ index b7e5656c5..3b82e8651 100644
+ - /home/labca/admin:/go/src/labca
+ - ./.gocache:/root/.cache/go-build
+ - /home/labca/nginx_data/static:/wwwstatic
+ - /home/labca/backup:/backup
+ - .:/boulder
+ - /home/labca/boulder_labca:/boulder/labca
+ expose: