From cfa2dc6e5c121257ba5e079bfd6e511ba84cc75a Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Wed, 20 Oct 2021 17:14:20 +0300
Subject: [PATCH] Connect to the internet over fiber optics!

New apartment, new internet connection. This time using fiber optics and
a _much_ faster connection. Change the port layout a bit. Change the
queueing a bit too.
---
 Ansible/roles/router/files/pf.conf   | 10 +++++-----
 Ansible/roles/router/tasks/main.yaml |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Ansible/roles/router/files/pf.conf b/Ansible/roles/router/files/pf.conf
index 138e46f..527d5f8 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 f99602f..aea97aa 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
-- 
GitLab