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
76d0669656
Avoid confusion and make sure the file is put in only one location
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
Ian Southam
5137d7e136
Removed dhcpopts.conf for now as, it is the routing options and they seem to be dealt with dofferently in the new arrangement
...
Changed the dhcp tests to avoid handing out the broadcast and gateway addresses :)
2015-03-16 11:35:25 +01:00
Hugo Trippaers
f21b90a73e
Add missing sourcenat rule
2015-03-16 11:35:25 +01:00
Hugo Trippaers
6d12d94e0c
Add the public source nat rule
2015-03-16 11:35:24 +01:00
Hugo Trippaers
80a149abb7
Add port forwarding and static nat to the convergence infrastructure
2015-03-16 11:35:24 +01:00
Hugo Trippaers
8c5dba31d0
Fix the forwardingrule databag
2015-03-16 11:35:24 +01:00
Ian Southam
7fc3365459
Implemented delete (add : false) for cs_dhcp
...
Added some tests to the test_update_config tests for dhcp entries
2015-03-16 11:35:24 +01:00
Ian Southam
e6e47de6ff
Stupid stupd bug
...
a or b is of course not the same as a | b
2015-03-16 11:35:23 +01:00
Ian Southam
c318bd6337
Corrected bug (I love tests)
...
The dhcp server will only start listening after a host has been added
In this condition, HUP is not enough
Changed so that if it is adding a first host it will restart the server
2015-03-16 11:35:23 +01:00
Ian Southam
0e8c79c7f1
That is the acls.
...
Need to check the order stays good
2015-03-16 11:35:23 +01:00
Hugo Trippaers
f273fd4659
Add the static nat rules to the merge procedure
2015-03-16 11:35:23 +01:00
Hugo Trippaers
a789e8bf57
Fix a bug that would add updated control ip address instead of replace
2015-03-16 11:35:22 +01:00
Ian Southam
8f4461567d
That should be all the dhcp settings correct
...
CsGuestNetwork moved out of configure
dnsmasq config all switched to CsDhcp
2015-03-16 11:35:22 +01:00
Ian Southam
b45c71ee31
Acl code linked in
...
Dhcp code
Test file for dhcp entry
2015-03-16 11:35:22 +01:00
Hugo Trippaers
683e660d60
Small (but important) fixes
2015-03-16 11:35:22 +01:00
Ian Southam
574fa2c0a0
Call update_config.py if it is there
2015-03-16 11:35:21 +01:00
Ian Southam
8abf1a22ab
Auto create missing chains
...
Auto delete superfluous rules
TO DO: Priorities
2015-03-16 11:35:21 +01:00
