diff --git a/Ansible/roles/router/files/pf.conf b/Ansible/roles/router/files/pf.conf index 138e46fe99e1db1bf455b0b510d82fc97f265032..527d5f8ee5fa9025decf1f32ddf852bcde1e4fc3 100644 --- a/Ansible/roles/router/files/pf.conf +++ b/Ansible/roles/router/files/pf.conf @@ -19,11 +19,11 @@ table <brute> persist #table for brute force attempts, etc. table <bgp-spamd-bypass> persist # table for spamd whitelisted addresses. # Queues, priorities -queue egress on pppoe0 bandwidth 50M qlimit 10000 -queue critical parent egress bandwidth 10M max 40M min 1M qlimit 2000 -queue services parent egress bandwidth 10M max 40M qlimit 2000 -queue other parent egress bandwidth 30M max 40M default qlimit 1000 -queue bulk parent egress bandwidth 30M qlimit 200 +queue egress on pppoe0 bandwidth 500M qlimit 10000 +queue critical parent egress bandwidth 100M max 400M min 10M qlimit 2000 +queue services parent egress bandwidth 100M max 400M qlimit 2000 +queue other parent egress bandwidth 300M max 400M default qlimit 1000 +queue bulk parent egress bandwidth 300M qlimit 200 match on egress proto { tcp, udp } to port { ssh, isakmp, l2tp, ipsec-nat-t, domain } set queue critical set prio 6 match on egress proto { ah, esp, gre, icmp } set queue critical set prio 6 match on egress proto tcp to port { smtp, www, https, submission, imaps } set queue services set prio 4 diff --git a/Ansible/roles/router/tasks/main.yaml b/Ansible/roles/router/tasks/main.yaml index f99602f39d095ca1286d122859f738a1be4a1190..aea97aa19cc19ba21f5d96d82da49e6c077f868d 100644 --- a/Ansible/roles/router/tasks/main.yaml +++ b/Ansible/roles/router/tasks/main.yaml @@ -67,17 +67,17 @@ - name: Configure the network interfaces with_dict: em1: | + description "Connected to the fiber cable, used for PPPoE connection to the ISP." + up + em5: | description "Connected to internal LAN." inet 192.168.3.1 255.255.255.0 group ingress up - em5: | - description "Connected to DSL modem for PPPoE connection to the ISP." - up pppoe0: | description "The connection to the internet." inet 62.219.131.121 255.255.255.255 NONE \ - pppoedev em5 authproto pap \ + pppoedev em1 authproto pap \ authname 'ns_nimadar@014' authkey '{{ bezeqint_password }}' up dest 0.0.0.1 !/sbin/route add default -ifp pppoe0 62.219.131.121