mshillam
/
Hellfire2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: mshillam:c1c586a1e42be9db0020e0189ff8eeb5f64f4283
Branches Tags
mshillam:master
..
compare: mshillam:192c3038aeaa4b47267d8468c05a78467d6e2016
Branches Tags
mshillam:master

No commits in common. "c1c586a1e42be9db0020e0189ff8eeb5f64f4283" and "192c3038aeaa4b47267d8468c05a78467d6e2016" have entirely different histories.
c1c586a1e4 ... 192c3038ae

1 changed files with 179 additions and 219 deletions
Show Stats Expand all files Collapse all files

398
config.xml
View File

@ -1306,38 +1306,6 @@
<time>1645397261.9664</time> <time>1645397261.9664</time>
<description>/firewall_nat_out_edit.php made changes</description> <description>/firewall_nat_out_edit.php made changes</description>
</updated> </updated>
<disabled>1</disabled>
</rule>
<rule>
<source>
<network>192.168.250.209/32</network>
</source>
<destination>
<any>1</any>
</destination>
<descr/>
<category/>
<interface>wan</interface>
<tag/>
<tagged/>
<poolopts/>
<poolopts_sourcehashkey/>
<ipprotocol>inet</ipprotocol>
<created>
<username>mshillam@192.168.250.162</username>
<time>1762975094.81</time>
<description>/firewall_nat_out_edit.php made changes</description>
</created>
<target/>
<targetip_subnet>0</targetip_subnet>
<staticnatport>1</staticnatport>
<sourceport/>
<log>1</log>
<updated>
<username>mshillam@192.168.250.162</username>
<time>1762980314.32</time>
<description>/firewall_nat_out_edit.php made changes</description>
</updated>
</rule> </rule>
<rule> <rule>
<source> <source>
@ -1435,7 +1403,7 @@
<interface>wan</interface> <interface>wan</interface>
<category/> <category/>
<ipprotocol>inet</ipprotocol> <ipprotocol>inet</ipprotocol>
<descr>SSH - FastPanel</descr> <descr/>
<tag/> <tag/>
<tagged/> <tagged/>
<poolopts/> <poolopts/>
@ -1450,8 +1418,8 @@
<port>2122</port> <port>2122</port>
</destination> </destination>
<updated> <updated>
<username>mshillam@192.168.250.162</username> <username>mshillam@192.168.1.10</username>
<time>1762991658.78</time> <time>1642164974.3858</time>
<description>/firewall_nat_edit.php made changes</description> <description>/firewall_nat_edit.php made changes</description>
</updated> </updated>
<created> <created>
@ -1465,7 +1433,7 @@
<interface>wan</interface> <interface>wan</interface>
<category/> <category/>
<ipprotocol>inet</ipprotocol> <ipprotocol>inet</ipprotocol>
<descr>SSH - Backup System</descr> <descr/>
<tag/> <tag/>
<tagged/> <tagged/>
<poolopts/> <poolopts/>
@ -1480,8 +1448,8 @@
<port>59349</port> <port>59349</port>
</destination> </destination>
<updated> <updated>
<username>mshillam@192.168.250.162</username> <username>mshillam@192.168.1.10</username>
<time>1762991679.40</time> <time>1643197834.847</time>
<description>/firewall_nat_edit.php made changes</description> <description>/firewall_nat_edit.php made changes</description>
</updated> </updated>
<created> <created>
@ -1520,37 +1488,6 @@
<description>/firewall_nat_edit.php made changes</description> <description>/firewall_nat_edit.php made changes</description>
</created> </created>
</rule> </rule>
<rule>
<protocol>udp</protocol>
<interface>wan</interface>
<category/>
<ipprotocol>inet</ipprotocol>
<descr>SIP + RTP UDP forward to SHILLAM VoIP server</descr>
<tag/>
<tagged/>
<poolopts/>
<associated-rule-id>nat_6914dd14467a85.86870511</associated-rule-id>
<target>192.168.250.209</target>
<local-port>PBX_SHILLAM_PORTS</local-port>
<source>
<any>1</any>
</source>
<destination>
<network>wanip</network>
<port>PBX_SHILLAM_PORTS</port>
</destination>
<natreflection>purenat</natreflection>
<updated>
<username>mshillam@192.168.250.162</username>
<time>1762992035.50</time>
<description>/firewall_nat_edit.php made changes</description>
</updated>
<created>
<username>mshillam@192.168.250.162</username>
<time>1762974996.29</time>
<description>/firewall_nat_edit.php made changes</description>
</created>
</rule>
<rule> <rule>
<protocol>udp</protocol> <protocol>udp</protocol>
<interface>wan</interface> <interface>wan</interface>
@ -1560,28 +1497,27 @@
<tag/> <tag/>
<tagged/> <tagged/>
<poolopts/> <poolopts/>
<associated-rule-id>nat_6914dd3053c322.11146330</associated-rule-id> <associated-rule-id>nat_61ddd973cb6413.87351681</associated-rule-id>
<target>192.168.250.209</target> <target>192.168.0.41</target>
<local-port>10000</local-port> <local-port>10000</local-port>
<source> <source>
<any>1</any> <any>1</any>
</source> </source>
<destination> <destination>
<network>wanip</network> <network>wanip</network>
<port>10000-20000</port> <port>10000-10100</port>
</destination> </destination>
<natreflection>purenat</natreflection> <natreflection>purenat</natreflection>
<updated> <updated>
<username>mshillam@192.168.250.162</username> <username>mshillam@192.168.250.162</username>
<time>1762975024.34</time> <time>1762853611.22</time>
<description>/firewall_nat_edit.php made changes</description> <description>/firewall_nat_edit.php made changes</description>
</updated> </updated>
<created> <created>
<username>mshillam@192.168.250.162</username> <username>mshillam@192.168.1.10</username>
<time>1762975024.34</time> <time>1641929075.8331</time>
<description>/firewall_nat_edit.php made changes</description> <description>/firewall_nat_edit.php made changes</description>
</created> </created>
<disabled>1</disabled>
</rule> </rule>
<rule> <rule>
<protocol>tcp/udp</protocol> <protocol>tcp/udp</protocol>
@ -1614,38 +1550,6 @@
<description>/firewall_nat_edit.php made changes</description> <description>/firewall_nat_edit.php made changes</description>
</created> </created>
</rule> </rule>
<rule>
<protocol>udp</protocol>
<interface>wan</interface>
<category/>
<ipprotocol>inet</ipprotocol>
<descr/>
<tag/>
<tagged/>
<poolopts/>
<associated-rule-id>nat_61ddd973cb6413.87351681</associated-rule-id>
<target>192.168.0.41</target>
<local-port>10000</local-port>
<source>
<any>1</any>
</source>
<destination>
<network>wanip</network>
<port>10000-10100</port>
</destination>
<natreflection>purenat</natreflection>
<updated>
<username>mshillam@192.168.250.162</username>
<time>1762853611.22</time>
<description>/firewall_nat_edit.php made changes</description>
</updated>
<created>
<username>mshillam@192.168.1.10</username>
<time>1641929075.8331</time>
<description>/firewall_nat_edit.php made changes</description>
</created>
<disabled>1</disabled>
</rule>
<rule> <rule>
<protocol>udp</protocol> <protocol>udp</protocol>
<interface>wan</interface> <interface>wan</interface>
@ -1676,7 +1580,6 @@
<time>1681469786.5916</time> <time>1681469786.5916</time>
<description>/firewall_nat_edit.php made changes</description> <description>/firewall_nat_edit.php made changes</description>
</created> </created>
<disabled>1</disabled>
</rule> </rule>
<rule> <rule>
<protocol>tcp/udp</protocol> <protocol>tcp/udp</protocol>
@ -1710,6 +1613,88 @@
</rule> </rule>
</nat> </nat>
<filter> <filter>
<rule uuid="687c66e1-f9ea-4088-b031-82adbeb15f11">
<type>block</type>
<interface>wan</interface>
<ipprotocol>inet</ipprotocol>
<statetype>keep state</statetype>
<descr>TEMP BLOCK DHCP</descr>
<direction>out</direction>
<floating>yes</floating>
<log>1</log>
<quick>1</quick>
<source>
<address>TEMPLOCK</address>
</source>
<destination>
<any>1</any>
</destination>
<updated>
<username>mshillam@192.168.250.162</username>
<time>1740311888.7792</time>
<description>/firewall_rules_edit.php made changes</description>
</updated>
<created>
<username>mshillam@192.168.250.162</username>
<time>1740311888.7792</time>
<description>/firewall_rules_edit.php made changes</description>
</created>
<disabled>1</disabled>
</rule>
<rule uuid="33719db1-c10f-4d5f-9baf-ac9ae8489f9a">
<type>pass</type>
<interface>wan</interface>
<ipprotocol>inet</ipprotocol>
<statetype>keep state</statetype>
<descr>ALLOW SPARKHOST EMAILS THROUGH</descr>
<direction>in</direction>
<floating>yes</floating>
<log>1</log>
<quick>1</quick>
<source>
<address>147.253.208.0/20</address>
</source>
<destination>
<any>1</any>
</destination>
<updated>
<username>mshillam@192.168.250.162</username>
<time>1739099637.4729</time>
<description>/firewall_rules_edit.php made changes</description>
</updated>
<created>
<username>mshillam@192.168.250.162</username>
<time>1739099627.7983</time>
<description>/firewall_rules_edit.php made changes</description>
</created>
</rule>
<rule uuid="3aa14700-0441-49d0-8115-0779e3598359">
<type>block</type>
<interface>opt1,lan,lo0,openvpn,wan</interface>
<ipprotocol>inet</ipprotocol>
<statetype>keep state</statetype>
<descr>Dodgy MAC block</descr>
<direction>any</direction>
<floating>yes</floating>
<log>1</log>
<quick>1</quick>
<source>
<address>192.168.69.69/24</address>
</source>
<destination>
<any>1</any>
</destination>
<updated>
<username>mshillam@192.168.1.10</username>
<time>1727375952.8533</time>
<description>/firewall_rules_edit.php made changes</description>
</updated>
<created>
<username>mshillam@192.168.1.10</username>
<time>1727375952.8533</time>
<description>/firewall_rules_edit.php made changes</description>
</created>
</rule>
<rule uuid="81644fc4-f08e-4a2e-b832-b4b9b528a830"> <rule uuid="81644fc4-f08e-4a2e-b832-b4b9b528a830">
<type>block</type> <type>block</type>
<interface>lan,wan</interface> <interface>lan,wan</interface>
@ -1764,6 +1749,58 @@
<description>/firewall_rules_edit.php made changes</description> <description>/firewall_rules_edit.php made changes</description>
</created> </created>
</rule> </rule>
<rule uuid="7a0f02cc-17f6-4769-84ee-1b27c08cf698">
<type>block</type>
<interface>wan</interface>
<ipprotocol>inet</ipprotocol>
<statetype>keep state</statetype>
<direction>in</direction>
<floating>yes</floating>
<log>1</log>
<quick>1</quick>
<source>
<address>178.208.164.0/22</address>
</source>
<destination>
<any>1</any>
</destination>
<updated>
<username>mshillam@192.168.1.10</username>
<time>1664719936.5096</time>
<description>/firewall_rules_edit.php made changes</description>
</updated>
<created>
<username>mshillam@192.168.1.10</username>
<time>1664719936.5096</time>
<description>/firewall_rules_edit.php made changes</description>
</created>
</rule>
<rule uuid="1626d4dc-363b-4458-8823-6c6388cdc9ac">
<type>block</type>
<interface>wan</interface>
<ipprotocol>inet</ipprotocol>
<statetype>keep state</statetype>
<direction>in</direction>
<floating>yes</floating>
<log>1</log>
<quick>1</quick>
<source>
<address>178.208.172.0/22</address>
</source>
<destination>
<any>1</any>
</destination>
<updated>
<username>mshillam@192.168.1.10</username>
<time>1664730543.8147</time>
<description>/firewall_rules_edit.php made changes</description>
</updated>
<created>
<username>mshillam@192.168.1.10</username>
<time>1664730543.8147</time>
<description>/firewall_rules_edit.php made changes</description>
</created>
</rule>
<rule uuid="1e7cd6a1-a8e4-4f72-99a3-2004396deb4c"> <rule uuid="1e7cd6a1-a8e4-4f72-99a3-2004396deb4c">
<type>pass</type> <type>pass</type>
<interface>lan</interface> <interface>lan</interface>
@ -1843,33 +1880,6 @@
<description>/firewall_rules_edit.php made changes</description> <description>/firewall_rules_edit.php made changes</description>
</created> </created>
</rule> </rule>
<rule uuid="2bdc2707-62fd-44d5-993e-5eea7cb27109">
<type>block</type>
<interface>wan</interface>
<ipprotocol>inet46</ipprotocol>
<statetype>keep state</statetype>
<descr>Block Shite countries from Core Services</descr>
<direction>in</direction>
<category>countries</category>
<log>1</log>
<quick>1</quick>
<source>
<address>block_shite_countries</address>
</source>
<destination>
<address>core_services</address>
</destination>
<updated>
<username>mshillam@192.168.250.162</username>
<time>1738931011.8372</time>
<description>/firewall_rules_edit.php made changes</description>
</updated>
<created>
<username>mshillam@192.168.250.162</username>
<time>1738931011.8372</time>
<description>/firewall_rules_edit.php made changes</description>
</created>
</rule>
<rule uuid="9164be23-f88a-4b24-929c-b9c6b070854a"> <rule uuid="9164be23-f88a-4b24-929c-b9c6b070854a">
<type>pass</type> <type>pass</type>
<interface>wan</interface> <interface>wan</interface>
@ -1897,6 +1907,33 @@
<description>/firewall_rules_edit.php made changes</description> <description>/firewall_rules_edit.php made changes</description>
</created> </created>
</rule> </rule>
<rule uuid="2bdc2707-62fd-44d5-993e-5eea7cb27109">
<type>block</type>
<interface>wan</interface>
<ipprotocol>inet46</ipprotocol>
<statetype>keep state</statetype>
<descr>Block Shite countries from Core Services</descr>
<direction>in</direction>
<category>countries</category>
<log>1</log>
<quick>1</quick>
<source>
<address>block_shite_countries</address>
</source>
<destination>
<address>core_services</address>
</destination>
<updated>
<username>mshillam@192.168.250.162</username>
<time>1738931011.8372</time>
<description>/firewall_rules_edit.php made changes</description>
</updated>
<created>
<username>mshillam@192.168.250.162</username>
<time>1738931011.8372</time>
<description>/firewall_rules_edit.php made changes</description>
</created>
</rule>
<rule uuid="be1536c9-c483-4398-9f7f-2eedb56baeea"> <rule uuid="be1536c9-c483-4398-9f7f-2eedb56baeea">
<type>block</type> <type>block</type>
<interface>wan</interface> <interface>wan</interface>
@ -2009,7 +2046,6 @@
<time>1641929075.8331</time> <time>1641929075.8331</time>
<description>/firewall_nat_edit.php made changes</description> <description>/firewall_nat_edit.php made changes</description>
</created> </created>
<disabled>1</disabled>
</rule> </rule>
<rule uuid="6510b99d-3311-4184-9280-363f90bc6048"> <rule uuid="6510b99d-3311-4184-9280-363f90bc6048">
<source> <source>
@ -2023,7 +2059,7 @@
<address>192.168.0.32</address> <address>192.168.0.32</address>
<port>2122</port> <port>2122</port>
</destination> </destination>
<descr>SSH - FastPanel</descr> <descr/>
<category/> <category/>
<associated-rule-id>nat_61e172ee5e2db6.55417174</associated-rule-id> <associated-rule-id>nat_61e172ee5e2db6.55417174</associated-rule-id>
<created> <created>
@ -2044,7 +2080,7 @@
<address>192.168.20.32</address> <address>192.168.20.32</address>
<port>59349</port> <port>59349</port>
</destination> </destination>
<descr>SSH - Backup System</descr> <descr/>
<category/> <category/>
<associated-rule-id>nat_61f1358acec6d1.41516685</associated-rule-id> <associated-rule-id>nat_61f1358acec6d1.41516685</associated-rule-id>
<created> <created>
@ -2073,7 +2109,6 @@
<time>1681469786.5916</time> <time>1681469786.5916</time>
<description>/firewall_nat_edit.php made changes</description> <description>/firewall_nat_edit.php made changes</description>
</created> </created>
<disabled>1</disabled>
</rule> </rule>
<rule uuid="a7cb285e-e332-4c72-a667-89dec3fedbc4"> <rule uuid="a7cb285e-e332-4c72-a667-89dec3fedbc4">
<source> <source>
@ -2257,51 +2292,6 @@
<description>/firewall_nat_edit.php made changes</description> <description>/firewall_nat_edit.php made changes</description>
</created> </created>
</rule> </rule>
<rule>
<type>pass</type>
<associated-rule-id>nat_6914dd14467a85.86870511</associated-rule-id>
<source>
<any>1</any>
</source>
<interface>wan</interface>
<statetype>keep state</statetype>
<protocol>udp</protocol>
<ipprotocol>inet</ipprotocol>
<destination>
<address>192.168.250.209</address>
<port>PBX_SHILLAM_PORTS</port>
</destination>
<descr>SIP + RTP UDP forward to SHILLAM VoIP server</descr>
<category/>
<created>
<username>mshillam@192.168.250.162</username>
<time>1762974996.29</time>
<description>/firewall_nat_edit.php made changes</description>
</created>
</rule>
<rule>
<type>pass</type>
<associated-rule-id>nat_6914dd3053c322.11146330</associated-rule-id>
<source>
<any>1</any>
</source>
<interface>wan</interface>
<statetype>keep state</statetype>
<protocol>udp</protocol>
<ipprotocol>inet</ipprotocol>
<destination>
<address>192.168.250.209</address>
<port>10000-20000</port>
</destination>
<descr/>
<category/>
<created>
<username>mshillam@192.168.250.162</username>
<time>1762975024.34</time>
<description>/firewall_nat_edit.php made changes</description>
</created>
<disabled>1</disabled>
</rule>
<scrub> <scrub>
<rule> <rule>
<interface>wireguard</interface> <interface>wireguard</interface>
@ -2383,8 +2373,8 @@
</widgets> </widgets>
<revision> <revision>
<username>mshillam@192.168.250.162</username> <username>mshillam@192.168.250.162</username>
<description>/firewall_rules.php made changes</description> <description>/firewall_nat.php made changes</description>
<time>1762992557.92</time> <time>1762853635.81</time>
</revision> </revision>
<OPNsense> <OPNsense>
<captiveportal version="1.0.4"> <captiveportal version="1.0.4">
@ -2463,7 +2453,7 @@
</template> </template>
</templates> </templates>
</Lvtemplate> </Lvtemplate>
<Alias version="1.0.1" persisted_at="1762991979.70" description="Firewall aliases"> <Alias version="1.0.1" persisted_at="1762726733.05" description="Firewall aliases">
<geoip> <geoip>
<url>https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&amp;license_key=bUDDilXVKtjByVCi&amp;suffix=zip</url> <url>https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&amp;license_key=bUDDilXVKtjByVCi&amp;suffix=zip</url>
</geoip> </geoip>
@ -4407,24 +4397,6 @@ Blocklist_AbuseIPDB4</content>
<categories/> <categories/>
<description/> <description/>
</alias> </alias>
<alias uuid="4e125d12-ddd3-4a84-9cb2-4f1425115751">
<enabled>1</enabled>
<name>PBX_SHILLAM_PORTS</name>
<type>port</type>
<path_expression/>
<proto/>
<interface/>
<counters>0</counters>
<updatefreq/>
<content>5060
10000:10100</content>
<password/>
<username/>
<authtype/>
<expire/>
<categories/>
<description>SIP + RTP UDP Ports for *SHILLAM* VoIP server</description>
</alias>
</aliases> </aliases>
</Alias> </Alias>
<Filter version="1.0.4"> <Filter version="1.0.4">
@ -4838,7 +4810,7 @@ Blocklist_AbuseIPDB4</content>
<template/> <template/>
</error_pages> </error_pages>
</proxy> </proxy>
<unboundplus version="1.0.12" persisted_at="1762980613.76" description="Unbound configuration"> <unboundplus version="1.0.12" persisted_at="1762705220.79" description="Unbound configuration">
<general> <general>
<enabled>1</enabled> <enabled>1</enabled>
<port>53</port> <port>53</port>
@ -5230,18 +5202,6 @@ Blocklist_AbuseIPDB4</content>
<txtdata/> <txtdata/>
<description>Firewall</description> <description>Firewall</description>
</host> </host>
<host uuid="8f88f173-0b00-476e-86bc-98f804ad6825">
<enabled>1</enabled>
<hostname>pbx</hostname>
<domain>shillam.me.uk</domain>
<rr>A</rr>
<mxprio/>
<mx/>
<ttl/>
<server>192.168.250.209</server>
<txtdata/>
<description>PBX LOCAL</description>
</host>
</hosts> </hosts>
<aliases/> <aliases/>
</unboundplus> </unboundplus>