Merge branch 'main' into stable

Allow more inc backups
Remove recursive for mysql db dir
2025-02-03 15:06:16 +01:00 · 2025-02-03 15:00:28 +01:00 · 2025-01-20 11:53:25 +01:00 · 2025-01-20 09:00:14 +01:00 · 2025-01-20 08:45:55 +01:00 · 2025-01-16 15:16:33 +01:00
1 changed files with 1 additions and 1 deletions
--- a/templates/script/check_backup.erb.sh
+++ b/templates/script/check_backup.erb.sh
@ -20,7 +20,7 @@ for project in $(ls ${data_dir}); do
    if [[ "${issixmonths}" == "true" ]]; then
      number_of_full_to_keep=6
    fi
-    max_num_inc=$((32 * number_of_full_to_keep))
+    max_num_inc=$((50 * number_of_full_to_keep))
    max_num_full=$((2 * number_of_full_to_keep))
    
 		tabular_data=$(cat "${data_dir}/${project}/${bucket}.dat")
Author	SHA1	Message	Date
Micke Nordin	0046349756	Merge branch 'main' into stable	2025-02-03 15:06:16 +01:00
Micke Nordin	def0a0a77b	Allow more inc backups	2025-02-03 15:00:28 +01:00
Lars Delhage	2625269aba	Remove recursive for mysql db dir	2025-01-20 11:53:25 +01:00
Micke Nordin	38cd097f71	Only run this on monitor hosts, as it takes a long time	2025-01-20 09:00:14 +01:00
Micke Nordin	ab2d70303f	Run as root user	2025-01-20 08:45:55 +01:00
Micke Nordin	0154a533ce	SATOSA: Always have alwayshttps	2025-01-16 15:16:33 +01:00
Micke Nordin	63b780028f	Multinode: Double book keeping Unfortunatly we must do the same calcultions for multinode	2025-01-16 13:14:37 +01:00
Micke Nordin	31f4c1eb9b	Set expiration for multinode	2025-01-16 12:47:16 +01:00
Micke Nordin	b6c0bb2f46	Merge branch 'testing'	2025-01-16 12:41:18 +01:00
Micke Nordin	9e6e33e137	Add full_backup_retention	2025-01-16 12:41:12 +01:00
Micke Nordin	977bd84f50	duplicate	2025-01-16 10:23:18 +01:00
Micke Nordin	c7de56f73f	one more	2025-01-16 10:23:17 +01:00
Micke	2abf9ecf27	Merge pull request 'added ability to set trashbin_retention_obligation and versions_retention_obligation in config.php' (#2 ) from richir-nextcloud-retention into testing Reviewed-on: #2	2025-01-16 09:22:30 +00:00
Rikard Danielsson	501ca8edfb	added ability to set trashbin_retention_obligation and versions_retention_obligation in config.php	2025-01-16 10:13:59 +01:00
Rasmus Thorslund	fff058613a	Merge branch 'main' into testing	2025-01-14 16:30:21 +01:00
Rasmus Thorslund	369492be90	changed nft rules for proxysql - ipv6	2025-01-14 16:30:00 +01:00
Rasmus Thorslund	856bc3b2c5	Merge branch 'main' into testing	2025-01-14 16:10:39 +01:00
Rasmus Thorslund	ebdf6f3b46	changed nft rules for proxysql	2025-01-14 16:07:18 +01:00
Micke Nordin	53e9a65b9f	duplicate	2025-01-14 13:00:59 +01:00
Micke Nordin	0400e89f36	one more	2025-01-14 12:58:16 +01:00
Micke Nordin	571535f569	Fix notify	2025-01-14 12:53:43 +01:00
Micke Nordin	09ee93515c	Fix notify	2025-01-14 12:53:25 +01:00
Micke Nordin	9f721c38e8	Merge branch 'testing'	2025-01-14 12:49:44 +01:00
Micke Nordin	d4fae26777	Can not redeclare class	2025-01-14 12:49:18 +01:00
Micke Nordin	c4f95af173	add back image	2025-01-14 12:43:52 +01:00
Micke Nordin	e0c4ddcd6e	Fix path	2025-01-14 12:36:12 +01:00
Micke	24a5abbefe	Merge pull request 'convert config to use newer docker_compose class' (#1 ) from richir-move-satosa-to-docker-compose into main Reviewed-on: #1	2025-01-14 11:29:04 +00:00
Rikard Danielsson	65a236dcaa	convert config to use newer docker_compose class	2025-01-14 12:26:50 +01:00