Bugzilla – Attachment 163157 Details for
Bug 36325
Add option to koha-run-backups/koha-dump, to exclude logs
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 36325: Add option to koha-run-backups/koha-dump, to exclude logs
Bug-36325-Add-option-to-koha-run-backupskoha-dump-.patch (text/plain), 5.61 KB, created by
Danyon Sewell
on 2024-03-15 01:25:39 UTC
(
hide
)
Description:
Bug 36325: Add option to koha-run-backups/koha-dump, to exclude logs
Filename:
MIME Type:
Creator:
Danyon Sewell
Created:
2024-03-15 01:25:39 UTC
Size:
5.61 KB
patch
obsolete
>From 22147c6a91bbeed51e0d82e9c9f63a7b6ea9d846 Mon Sep 17 00:00:00 2001 >From: danyonsewell <danyonsewell@catalyst.net.nz> >Date: Fri, 15 Mar 2024 01:21:53 +0000 >Subject: [PATCH] Bug 36325: Add option to koha-run-backups/koha-dump, to > exclude logs > >Written patch to add flag to both koha-dump and koha-run-backups. > >Test plan: >1. do a sudo koha-dump and sudo koha-run-backups and check the contents of the .tar.gz backup in /var/spool/koha/instance/ and verify logs are in there >2. apply this patch >3. this time do sudo koha-dump --exclude-logs and sudo koha-run-backups --exclude-logs and check the contents of the .tar.gz backup in /var/spool/koha/instance and verify nothing from /var/log/koha is in there. >--- > debian/scripts/koha-dump | 24 +++++++++++++++++++++--- > debian/scripts/koha-run-backups | 13 +++++++------ > 2 files changed, 28 insertions(+), 9 deletions(-) > >diff --git a/debian/scripts/koha-dump b/debian/scripts/koha-dump >index d9946073009..f58c4b20229 100755 >--- a/debian/scripts/koha-dump >+++ b/debian/scripts/koha-dump >@@ -2,17 +2,17 @@ > # > # koha-dump: dump all contents and configs for a Koha site > # Copyright 2010 Catalyst IT, Ltd >-# >+# > # This program is free software: you can redistribute it and/or modify > # it under the terms of the GNU General Public License as published by > # the Free Software Foundation, either version 3 of the License, or > # (at your option) any later version. >-# >+# > # This program is distributed in the hope that it will be useful, > # but WITHOUT ANY WARRANTY; without even the implied warranty of > # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > # GNU General Public License for more details. >-# >+# > # You should have received a copy of the GNU General Public License > # along with this program. If not, see <http://www.gnu.org/licenses/>. > >@@ -48,6 +48,7 @@ $scriptname -h|--help > > --schema-only Dump only the database schema > --exclude-indexes Include Zebra indexes on the backup >+ --exclude-logs Exclude /var/log/koha/name from the backup > --uploaded_files Include uploaded files. > --uploaded_temp_files Include temporary uploaded files. > --quiet|-q Make the script avoid printing to STDOUT >@@ -123,6 +124,18 @@ dump_instance() > output="$output to $metadump" > [ "$quiet" = "no" ] && echo "$output" > >+ if [ "$exclude_logs" = "yes" ]; then >+ tar -czf "$metadump" -C / $excludes \ >+ "etc/koha/sites/$name" \ >+ "etc/apache2/sites-available/$instancefile" \ >+ "etc/apache2/sites-enabled/$instancefile" \ >+ "var/lib/koha/$name" \ >+ $uploaded_files_dir \ >+ $uploaded_temp_files_dir >+ >+ chown "root:$name-koha" "$metadump" >+ chmod g+r "$metadump" >+ else > tar -czf "$metadump" -C / $excludes \ > "etc/koha/sites/$name" \ > "etc/apache2/sites-available/$instancefile" \ >@@ -134,6 +147,7 @@ dump_instance() > > chown "root:$name-koha" "$metadump" > chmod g+r "$metadump" >+ fi > > [ "$quiet" = "no" ] && echo "Done." > fi >@@ -144,6 +158,7 @@ quiet="no" > exclude_indexes="no" > without_db_name="no" > schema_only="no" >+exclude_logs="no" > > while [ $# -gt 0 ]; do > >@@ -154,6 +169,9 @@ while [ $# -gt 0 ]; do > --exclude-indexes) > exclude_indexes="yes" > shift ;; >+ --exclude-logs) >+ exclude_logs="yes" >+ shift ;; > --without-db-name) > without_db_name="yes" > shift ;; >diff --git a/debian/scripts/koha-run-backups b/debian/scripts/koha-run-backups >index a9223844fe3..618013fbde5 100755 >--- a/debian/scripts/koha-run-backups >+++ b/debian/scripts/koha-run-backups >@@ -1,16 +1,16 @@ > #!/bin/sh > # Copyright 2010-2011 Catalyst IT, Ltd >-# >+# > # This program is free software: you can redistribute it and/or modify > # it under the terms of the GNU General Public License as published by > # the Free Software Foundation, either version 3 of the License, or > # (at your option) any later version. >-# >+# > # This program is distributed in the hope that it will be useful, > # but WITHOUT ANY WARRANTY; without even the implied warranty of > # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > # GNU General Public License for more details. >-# >+# > # You should have received a copy of the GNU General Public License > # along with this program. If not, see <http://www.gnu.org/licenses/>. > >@@ -40,7 +40,7 @@ EOH > > exclude_indexes="" > >-CMD_LINE=`getopt -o h --long days:,output:,help,exclude-indexes -n 'koha-run-backups' -- "$@"` >+CMD_LINE=`getopt -o h --long days:,output:,help,exclude-indexes,exclude-logs -n 'koha-run-backups' -- "$@"` > > if [ $? != 0 ] ; then show_help ; exit 1 ; fi > >@@ -55,6 +55,8 @@ while true ; do > dirname=$2; shift 2 ;; > --exclude-indexes) > exclude_indexes='--exclude-indexes'; shift ;; >+ --exclude-logs) >+ exclude_logs='--exclude-logs'; shift ;; > --) shift ; break ;; > *) echo "Unknown error parsing the command line!" ; exit 1 ;; > esac >@@ -67,7 +69,7 @@ fi > > for name in $(koha-list --enabled | grep -Fxv demo) > do >- if koha-dump ${exclude_indexes} "$name" > /dev/null; then >+ if /kohadevbox/koha/debian/scripts/koha-dump ${exclude_indexes} ${exclude_logs} "$name" > /dev/null; then > # Only delete old backups if dump script return success. > > if [ -z "$dirname" ]; then >@@ -79,4 +81,3 @@ do > find $backupdir -maxdepth 1 \( -mtime +$days -or -mtime $days \) -name $name-'[1-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9].???'.gz \( -name \*.sql.gz -or -name \*.tar.gz \) -print0 | xargs -0 -r rm > fi > done >- >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 36325
:
163157
|
163158
|
163754
|
163760
|
166583
|
166584