EOF & whitespace
This commit is contained in:
		
							parent
							
								
									e7e98d0b47
								
							
						
					
					
						commit
						7fcc5afc64
					
				
							
								
								
									
										7
									
								
								.pre-commit-config.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								.pre-commit-config.yaml
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
				
			|||||||
 | 
					repos:
 | 
				
			||||||
 | 
					-   repo: https://github.com/pre-commit/pre-commit-hooks
 | 
				
			||||||
 | 
					    rev: v5.0.0
 | 
				
			||||||
 | 
					    hooks:
 | 
				
			||||||
 | 
					    -   id: trailing-whitespace
 | 
				
			||||||
 | 
					    -   id: end-of-file-fixer
 | 
				
			||||||
 | 
					    -   id: check-yaml
 | 
				
			||||||
@ -18,4 +18,3 @@ EXPOSE 8080
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
ENTRYPOINT ["/entrypoint.sh"]
 | 
					ENTRYPOINT ["/entrypoint.sh"]
 | 
				
			||||||
CMD ["/usr/local/bin/python3.12","/opt/tisbackup/tisbackup_gui.py"]
 | 
					CMD ["/usr/local/bin/python3.12","/opt/tisbackup/tisbackup_gui.py"]
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -39,4 +39,3 @@ services:
 | 
				
			|||||||
            reservations:
 | 
					            reservations:
 | 
				
			||||||
              cpus: 0.25
 | 
					              cpus: 0.25
 | 
				
			||||||
              memory: 128M
 | 
					              memory: 128M
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -52,5 +52,3 @@ The documentation for tisbackup is here: [tisbackup doc](https://tisbackup.readt
 | 
				
			|||||||
    dpkg --force-all --purge tis-tisbackup
 | 
					    dpkg --force-all --purge tis-tisbackup
 | 
				
			||||||
    apt autoremove
 | 
					    apt autoremove
 | 
				
			||||||
 ```
 | 
					 ```
 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -7,4 +7,3 @@ Depends:  unzip, ssh, rsync, python3-paramiko, python3-pyvmomi, python3-pexpect,
 | 
				
			|||||||
Maintainer: Tranquil-IT <technique@tranquil.it>
 | 
					Maintainer: Tranquil-IT <technique@tranquil.it>
 | 
				
			||||||
Description: TISBackup backup management
 | 
					Description: TISBackup backup management
 | 
				
			||||||
Homepage: https://www.tranquil.it
 | 
					Homepage: https://www.tranquil.it
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -32,5 +32,3 @@ rsync -aP ../samples/tisbackup-config.ini.sample  ./builddir/etc/tis/tisbackup-c
 | 
				
			|||||||
chmod 755 ./builddir/opt/tisbackup/tisbackup.py
 | 
					chmod 755 ./builddir/opt/tisbackup/tisbackup.py
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dpkg-deb --build builddir tis-tisbackup-1-${VERSION}.deb
 | 
					dpkg-deb --build builddir tis-tisbackup-1-${VERSION}.deb
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								docs/_static/language_data.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								docs/_static/language_data.js
									
									
									
									
										vendored
									
									
								
							@ -293,5 +293,3 @@ function splitQuery(query) {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
    return result;
 | 
					    return result;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -5,4 +5,3 @@ env >> /etc/environment
 | 
				
			|||||||
# execute CMD
 | 
					# execute CMD
 | 
				
			||||||
echo "$@"
 | 
					echo "$@"
 | 
				
			||||||
exec "$@"
 | 
					exec "$@"
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -15,4 +15,3 @@
 | 
				
			|||||||
#    along with TISBackup.  If not, see <http://www.gnu.org/licenses/>.
 | 
					#    along with TISBackup.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# -----------------------------------------------------------------------
 | 
					# -----------------------------------------------------------------------
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -49,4 +49,3 @@ register_driver(backup_null)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
if __name__=='__main__':
 | 
					if __name__=='__main__':
 | 
				
			||||||
    pass
 | 
					    pass
 | 
				
			||||||
    
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -341,4 +341,3 @@ if __name__=='__main__':
 | 
				
			|||||||
    b.read_config(cp)
 | 
					    b.read_config(cp)
 | 
				
			||||||
    b.process_backup()
 | 
					    b.process_backup()
 | 
				
			||||||
    print((b.checknagios()))
 | 
					    print((b.checknagios()))
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -358,4 +358,3 @@ if __name__=='__main__':
 | 
				
			|||||||
    b.read_config(cp)
 | 
					    b.read_config(cp)
 | 
				
			||||||
    b.process_backup()
 | 
					    b.process_backup()
 | 
				
			||||||
    print((b.checknagios()))
 | 
					    print((b.checknagios()))
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -262,4 +262,3 @@ if __name__=='__main__':
 | 
				
			|||||||
    cp.read('/opt/tisbackup/configtest.ini')
 | 
					    cp.read('/opt/tisbackup/configtest.ini')
 | 
				
			||||||
    b = backup_xva()
 | 
					    b = backup_xva()
 | 
				
			||||||
    b.read_config(cp)
 | 
					    b.read_config(cp)
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -279,4 +279,3 @@ class backup_vmdk(backup_generic):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
register_driver(backup_vmdk)
 | 
					register_driver(backup_vmdk)
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -12,4 +12,3 @@ echo $VERSION > __VERSION__
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
rpmbuild -bb --buildroot $PWD/builddir -v --clean tis-tisbackup.spec
 | 
					rpmbuild -bb --buildroot $PWD/builddir -v --clean tis-tisbackup.spec
 | 
				
			||||||
cp RPMS/*/*.rpm .
 | 
					cp RPMS/*/*.rpm .
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -14,5 +14,3 @@ else
 | 
				
			|||||||
  sleep 3
 | 
					  sleep 3
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
echo $(date +%Y-%m-%d\ %H:%M:%S) : Fin Export TISBackup sur Disque USB : $target >> /var/log/tisbackup.log
 | 
					echo $(date +%Y-%m-%d\ %H:%M:%S) : Fin Export TISBackup sur Disque USB : $target >> /var/log/tisbackup.log
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -95,4 +95,3 @@ maximum_backup_age=30
 | 
				
			|||||||
;type=xcp-dump-metadata
 | 
					;type=xcp-dump-metadata
 | 
				
			||||||
;server_name=srvxen1
 | 
					;server_name=srvxen1
 | 
				
			||||||
;private_key=/root/.ssh/id_rsa
 | 
					;private_key=/root/.ssh/id_rsa
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -18,4 +18,3 @@ password_file=/home/homes/ssamson/tisbackup-pra/xen_passwd
 | 
				
			|||||||
network_name=net-test
 | 
					network_name=net-test
 | 
				
			||||||
#start_vm=no
 | 
					#start_vm=no
 | 
				
			||||||
#max_copies=3
 | 
					#max_copies=3
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -4,4 +4,3 @@
 | 
				
			|||||||
# m h dom mon dow user  command
 | 
					# m h dom mon dow user  command
 | 
				
			||||||
30 22   * * *   root  /opt/tisbackup/tisbackup.py -c /etc/tis/tisbackup-config.ini backup >> /var/log/tisbackup.log 2>&1
 | 
					30 22   * * *   root  /opt/tisbackup/tisbackup.py -c /etc/tis/tisbackup-config.ini backup >> /var/log/tisbackup.log 2>&1
 | 
				
			||||||
30 12   * * *   root  /opt/tisbackup/tisbackup.py -c /etc/tis/tisbackup-config.ini cleanup >> /var/log/tisbackup.log 2>&1
 | 
					30 12   * * *   root  /opt/tisbackup/tisbackup.py -c /etc/tis/tisbackup-config.ini cleanup >> /var/log/tisbackup.log 2>&1
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -95,4 +95,3 @@ case "$1" in
 | 
				
			|||||||
esac
 | 
					esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
exit 0
 | 
					exit 0
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -95,4 +95,3 @@ case "$1" in
 | 
				
			|||||||
esac
 | 
					esac
 | 
				
			||||||
 | 
					
 | 
				
			||||||
exit 0
 | 
					exit 0
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										1
									
								
								static/js/jquery.dataTables.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								static/js/jquery.dataTables.js
									
									
									
									
										vendored
									
									
								
							@ -14948,4 +14948,3 @@
 | 
				
			|||||||
}));
 | 
					}));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}(window, document));
 | 
					}(window, document));
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -98,4 +98,3 @@
 | 
				
			|||||||
    </script>
 | 
					    </script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</body></html>
 | 
					</body></html>
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user