From efa6d44d0d6b2e601b6e1d8bceeec06cd16403fd Mon Sep 17 00:00:00 2001 From: ssamson-tis Date: Fri, 10 Jul 2015 16:58:43 +0200 Subject: [PATCH] Remove duplicate tisbackup-config.ini --- samples/config.ini.sample | 39 ++++++++++++-- samples/tisbackup-config.ini | 99 ------------------------------------ 2 files changed, 36 insertions(+), 102 deletions(-) delete mode 100644 samples/tisbackup-config.ini diff --git a/samples/config.ini.sample b/samples/config.ini.sample index a620b07..e81b374 100644 --- a/samples/config.ini.sample +++ b/samples/config.ini.sample @@ -1,5 +1,5 @@ [global] -backup_base_dir = /root/tisbackup/backup_dir +backup_base_dir = /backup/data/ # backup retention in days backup_retention_time=90 @@ -27,8 +27,8 @@ maximum_backup_age=30 ;[backup_mysql_srvintranet] ;type=mysql+ssh ;server_name=srvintranet -;private_keys=/root/.ssh/id_dsa -;db_name=* +;private_key=/root/.ssh/id_dsa +;db_name=wiki ;db_user=root ;db_passwd=mypassword @@ -53,3 +53,36 @@ maximum_backup_age=30 ;switch_password=toto ;switch_type=LINKSYS-SRW2024 + +;[backup_mysql_srvintranet] +;type=mysql+ssh +;server_name=srvintranet +;private_key=/root/.ssh/id_dsa +;db_name= +;db_user=root +;db_passwd= + + +;[backup_mysql_srvintranet] +;type=mysql+ssh +;server_name=srvintranet +;private_key=/root/.ssh/id_dsa +;db_name= +;db_user=root +;db_passwd= + +;[[backup_sql_srvintranet]] +;[type=sqlserver+ssh] +;[server_name=srvintranet ] +;[private_key=/root/.ssh/id_dsa] +;[db_name=testbackup] +;[db_user=sa] +;[db_password=xxx] + + +;[debian-ovf]] +;[type=esx-vmdk] +;[server_name=debian] +;[esxhost=192.168.149.213] +;[password_file=/etc/.esx_passwd] +;[create_ovafile=yes] diff --git a/samples/tisbackup-config.ini b/samples/tisbackup-config.ini deleted file mode 100644 index 88e911c..0000000 --- a/samples/tisbackup-config.ini +++ /dev/null @@ -1,99 +0,0 @@ -[global] -backup_base_dir = /backup/data/ - -# backup retention in days -backup_retention_time=15 - -# for nagios check in hours -maximum_backup_age=30 - -# bandwith limit for rsync -#bw_limit = 300 - -#compression level for rsync (0 to 9) -#compression_level=7 - -[srvfichiers-partages] -type=rsync+ssh -server_name=srvfichiers -remote_dir=/home/partages -exclude_list= -private_key=/root/.ssh/id_dsa -ssh_port = 22 - -[srvintranet-slash] -type=rsync+ssh -server_name=srvintranet -remote_dir=/ -exclude_list="/proc/**","/sys/**","/dev/**" -private_key=/root/.ssh/id_dsa -ssh_port = 22 - -[srvads-slash] -type=rsync+ssh -server_name=srvads -remote_dir=/ -exclude_list="/proc/**","/sys/**","/dev/**" -private_key=/root/.ssh/id_dsa - -[srvzimbra-slash] -type=rsync+ssh -server_name=srvzimbra -remote_dir=/ -exclude_list="/proc/**","/sys/**","/dev/**","/opt/**" -private_key=/root/.ssh/id_dsa -ssh_port = 22 - -[srvzimbra-opt] -type=rsync+ssh -server_name=srvzimbra -remote_dir=/opt -exclude_list= -private_key=/root/.ssh/id_dsa -ssh_port = 22 - -[gateway] -type=null -server_name=fwall - -[srvopenerp6-prod-pgsql] -type=pgsql+ssh -server_name=srvopenerp6-prod -db_name=tranquil_production -private_key=/root/.ssh/id_dsa -ssh_port = 22 - -[srvopenerp6-form-script] -type=rsync+ssh -server_name=srvopenerp6-form -remote_dir=/home/openerp/instances/form/openobject-library/ -exclude_list= -private_key=/root/.ssh/id_rsa -ssh_port = 22 - -;preexec=/etc/init.d/zimbra stop -;postexec=/etc/init.d/zimbra start - -;[backup_mysql_srvintranet] -;type=mysql+ssh -;server_name=srvintranet -;private_key=/root/.ssh/id_dsa -;db_name= -;db_user=root -;db_passwd= - -[backup_sql_srvintranet] -type=sqlserver+ssh -server_name=srvintranet -private_key=/root/.ssh/id_dsa -db_name=testbackup -db_user=sa -db_password=xxx - - -[debian-ovf] -type=esx-vmdk -server_name=debian -esxhost=192.168.149.213 -password_file=/etc/.esx_passwd -create_ovafile=yes