From 9634ad7aebba35eeebac12e3b0d4ab0f6075d377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=A4hnel?= <michael.haehnel@netgo.de>
Date: Tue, 27 Jun 2023 06:55:54 +0000
Subject: [PATCH] DEV-1110 Remove old data dir on restore server

---
 .../smardigo_user_token.cpython-311.pyc          | Bin 0 -> 1345 bytes
 roles/restore_maria/files/restore.sh             |   3 +--
 roles/restore_postgres/files/restore.sh          |   4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 library/__pycache__/smardigo_user_token.cpython-311.pyc

diff --git a/library/__pycache__/smardigo_user_token.cpython-311.pyc b/library/__pycache__/smardigo_user_token.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ec79a79021c1627f6a5e8c0a7c395dab6156a756
GIT binary patch
literal 1345
zcmaJ=&2Jk;6rbH4ukEcjE#QVE99S%bY9z;@d<a<(DWo=3<O3;=gd(-8wP#|lvme&X
zx)2jfM(TkB_x8|34=AKc4*Ur{@CR(7NJMi&LL9iDMS)9Cyj_0)QpNL|H*em&FaPH4
z_qwhjpx-0EF{dE(OMIA+JXS8(KzV=&+CfCxk%&wbM|PDRMM9us2iFlv-A6kqsuFcC
ziDEe!(bOTt9Z#|$@J??ftC;C;YNb+1bA8ftXvN^J#faVV%^s)B4E#OnX}s;Tz$BD6
zncWR+->Vo+My-HOy^Yx07<u=fXeFcV^MF?j$8TCrtZRl5SbUFHKq(oX<wB|d$zcFJ
zr;|83xuOsoRE$DlY)G25$<)GV%jN-P6@yXUbK>$PgV08=RWa^a?8CA3w-}M4B$Un<
z6gKJ2<`g1OR9Ns3=<*B%fS$npNS^Nakvu?w1eaqvKqsj~I3G`K11X3zjHxquMnu#D
zsWZJH>G_EZ>VrlyvHXum_8$+Tkt-*;Lkx9bjc6brNROwdi8bDdejuOB975&eX?1vh
zw1tXSH)=xR0V~QPP3W!#I0+o=cPSWDo<J<pV`Kpx-D0htOTED4UE1ttzAEruqfjZZ
zcx?M}VZgGW2!+_Judlpy^ZnJ2R!g63-F){w$d|R8me1^<?Fx;0O}3xRQ9Ul*Y+GK7
z5|K*Ar<fA@ipTASL)Vj$WHC%4Jq{9T*J75-MV5YP2WE%+UQrS1u1y`ng*uvIb`3&!
z90$YlY^}Tv!^z984V9>~2%_y#r`+_3?X}8n8uUHNO4g`o*|8hUV*BOijNf8+Utrg=
zJvIlqXX7FdKnzi&qE}x(+74fQ8~6fL8ou-naFkMJ)ChqX*8bAa%qvH;p}usgFP-a4
z!`iR8tKWY5P<y=lo%_S>^EZ}H=a!%5Pv@#n@BKIkx9^;Pd^ha)5kdoLO@>Whm;XrQ
zpNSk+f5zHRIDdxo59>$QL!3Xw<#SvPCwvL5A(1i7xMS1YD5iyeYjbsby}D6fso&n*
z5Si-dE9;-FRksB0_<&J@^uid3#SxZfFR&fH*s!?WO#XJ9G5&r{^9f?{RI-;rJj;AA
z@?U1J!7=^-_%4V@kt8Wn@e6pUM_M+AhnZ*=N!LS^|2JQt8{vc_d_`J{&{QlSocpGK
crp$-R`~}VoZ+%_6UmGUBNI`f3%t;@A17w435&!@I

literal 0
HcmV?d00001

diff --git a/roles/restore_maria/files/restore.sh b/roles/restore_maria/files/restore.sh
index ff78b43..d555344 100644
--- a/roles/restore_maria/files/restore.sh
+++ b/roles/restore_maria/files/restore.sh
@@ -12,8 +12,7 @@ DATE=$(date +%F)
 
 systemctl stop mariadb
 
-rm -rf ${DATADIR}_moved
-mv ${DATADIR} ${DATADIR}_moved
+rm -rf ${DATADIR}
 mkdir -p ${DATADIR}
 
 LOCAL_BACKUP_DIR="/home/backupuser/backups/${STAGE}/maria/${DATABASE_SERVER}"
diff --git a/roles/restore_postgres/files/restore.sh b/roles/restore_postgres/files/restore.sh
index b707513..a0748ab 100644
--- a/roles/restore_postgres/files/restore.sh
+++ b/roles/restore_postgres/files/restore.sh
@@ -14,9 +14,7 @@ PG_GROUP=postgres
 
 systemctl stop postgresql
 
-rm -rf ${DATADIR}_moved
-
-mv ${DATADIR} ${DATADIR}_moved
+rm -rf ${DATADIR}
 mkdir -p ${DATADIR}
 
 LOCAL_BACKUP_DIR="/home/backupuser/backups/${STAGE}/postgres/${DATABASE_SERVER}"