Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							d89c1e28ab 
							
						 
					 
					
						
						
							
							Forgot to add append method  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							ec09f04b88 
							
						 
					 
					
						
						
							
							Small bug  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							84624091fd 
							
						 
					 
					
						
						
							
							Load balancer config  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							7d0df32560 
							
						 
					 
					
						
						
							
							Lots of fixes from the testing  
						
						 
						
						... 
						
						
						
						firewallrules implemented sperately from networkacl (ugly but best that can be done ATM)
Some refactoring in CsDHCP as it made no sense to do it that way anymore
processmonitoring implemented
Domain not correctly sourced in VR 
						
						
					 
					
						2015-03-16 11:38:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							08d2e10cb9 
							
						 
					 
					
						
						
							
							pep8  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							0496ba7a00 
							
						 
					 
					
						
						
							
							firewallrules (VR) and metworkacl (VPC) did not as I believe they shgould get combined  
						
						 
						
						... 
						
						
						
						in the underlying java code
Have split them out again.
Omce tested this will need some refactorinfg because it is currently PFU 
						
						
					 
					
						2015-03-16 11:38:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							f924a9755d 
							
						 
					 
					
						
						
							
							Adding port forwarding ranges exposes a rather unfortunate typo  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							467374c981 
							
						 
					 
					
						
						
							
							This time after running the unittests <blush>  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							cca4b58d50 
							
						 
					 
					
						
						
							
							A couple of firewall fixes for DomRouter code  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							099add4fd6 
							
						 
					 
					
						
						
							
							Removing "global" declaration from if block  
						
						 
						
						... 
						
						
						
						In python an "if" block doesn't change the scope. So, global not needed as it was creating an warning. 
						
						
					 
					
						2015-03-16 11:38:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							185975f6ac 
							
						 
					 
					
						
						
							
							Adding [ERROR] tag before error message to ease identification  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							5c4d221c34 
							
						 
					 
					
						
						
							
							Let's stick to CamelCase for now  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							6b0c40ed3e 
							
						 
					 
					
						
						
							
							iAdd chains before provisioning rules  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							50ee12c6e3 
							
						 
					 
					
						
						
							
							Corrected basic firewalling setup  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							4cdaada380 
							
						 
					 
					
						
						
							
							Bugger  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							dce2c9e35a 
							
						 
					 
					
						
						
							
							Syntax error  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							092c8924c9 
							
						 
					 
					
						
						
							
							Bug corrections  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							5249df8799 
							
						 
					 
					
						
						
							
							Splitting router and vpc  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							99d7c8f457 
							
						 
					 
					
						
						
							
							Fix syntax error  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							945cc0bcfb 
							
						 
					 
					
						
						
							
							Aligning router chain names correctly  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							a2e7f30542 
							
						 
					 
					
						
						
							
							Fix license headers  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							18f517a8b1 
							
						 
					 
					
						
						
							
							pep8  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9385f071d7 
							
						 
					 
					
						
						
							
							Fix PEP8 compliance  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							acaeec9a27 
							
						 
					 
					
						
						
							
							Fix indent  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							5dcdf26328 
							
						 
					 
					
						
						
							
							Typo  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							54f5c53a20 
							
						 
					 
					
						
						
							
							Decided not at this stage to combine VPC and VR code  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							0afe0153a7 
							
						 
					 
					
						
						
							
							Fix tab characters  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							2f8352bf96 
							
						 
					 
					
						
						
							
							Daft mistake that left more data getting merged than we would have liked  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							01acd3d8ec 
							
						 
					 
					
						
						
							
							VR interfaces need the proper network type in ips  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4632936733 
							
						 
					 
					
						
						
							
							We actually don't need all the process stuff  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:38:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							a9c5f91223 
							
						 
					 
					
						
						
							
							Fix indents  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:35:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							ba4684d53d 
							
						 
					 
					
						
						
							
							Updated incorrect file.  
						
						 
						
						... 
						
						
						
						This led to the file loading twice 
						
						
					 
					
						2015-03-16 11:35:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							e30da35879 
							
						 
					 
					
						
						
							
							Interfaces were not coming up on non redundant router  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:35:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4cfe2a32c0 
							
						 
					 
					
						
						
							
							Fix a few things introduced by the rebase  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:35:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							55c008f569 
							
						 
					 
					
						
						
							
							Cockup during the adding of the Apache licence  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:35:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							f0b783bb11 
							
						 
					 
					
						
						
							
							Removed stuff that is moved to CsRedundant  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:35:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							7b95b78223 
							
						 
					 
					
						
						
							
							backup fault and master implemented  
						
						 
						
						... 
						
						
						
						Some more refactoring to decluter the bin directory
New config class to carry around the log, command line and firewall data 
						
						
					 
					
						2015-03-16 11:35:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							8a2391336c 
							
						 
					 
					
						
						
							
							Getting redundancy to work via teh configuration files  
						
						 
						
						... 
						
						
						
						Some refactoring to make class loading a little more logical
Removed fw global (does not persist accross modules)
Added first tests
Added command line call to set and disable redundancy
Added command line call to set master 
						
						
					 
					
						2015-03-16 11:35:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							093749eaae 
							
						 
					 
					
						
						
							
							A start on the redundancy code  
						
						 
						
						... 
						
						
						
						This will not break anything but also will not work 
						
						
					 
					
						2015-03-16 11:35:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							a01e9082cd 
							
						 
					 
					
						
						
							
							New code for ACLs (VPN configuration) failed functional tests  
						
						 
						
						... 
						
						
						
						Some corrections 
						
						
					 
					
						2015-03-16 11:35:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							f7d0a11a34 
							
						 
					 
					
						
						
							
							Process VPN requests\  
						
						 
						
						... 
						
						
						
						No tests (yet) 
						
						
					 
					
						2015-03-16 11:35:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							b95d8257a4 
							
						 
					 
					
						
						
							
							Merge operation for site2site vpn  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:35:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							725c040d5c 
							
						 
					 
					
						
						
							
							Added code to configure netusage for vpc and domR devices  
						
						 
						
						... 
						
						
						
						Removed code from existing scripts that does the same
Fixed some more issues with CsNetfilter
Added rsync for/etc/iptables in rsync 
						
						
					 
					
						2015-03-16 11:35:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							3cdaa55462 
							
						 
					 
					
						
						
							
							icmp-type parameter was being skipped  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:35:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							2765a506dc 
							
						 
					 
					
						
						
							
							Moved databag into a separate file  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:35:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							733bc19eac 
							
						 
					 
					
						
						
							
							Include base rule sets in Acls  
						
						 
						
						... 
						
						
						
						Also made some adjustments to the base rule sets to ensure my parsing routine works 
						
						
					 
					
						2015-03-16 11:35:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							a7338387c1 
							
						 
					 
					
						
						
							
							Sourcenat is handled differently for routers and vpc routers  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:35:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							576564e744 
							
						 
					 
					
						
						
							
							If a file doesn't exist, create it  
						
						 
						
						
						
						
					 
					
						2015-03-16 11:35:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							762e05ddee 
							
						 
					 
					
						
						
							
							Bug fixed:  
						
						 
						
						... 
						
						
						
						Default drop rul for inbound chain gets dropped by CsNetFilter
This would have been bad (tm) 
						
						
					 
					
						2015-03-16 11:35:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							8b38bff962 
							
						 
					 
					
						
						
							
							A lot of corner cases dealt with  
						
						 
						
						... 
						
						
						
						Need now to expand the test data to ensure I have got them all
Also failure to match because bizarrely some strings were unicode and some not 
						
						
					 
					
						2015-03-16 11:35:25 +01:00