diff --git a/MirrorListV4 b/MirrorListV4 index 32018e2..568b3a3 100644 --- a/MirrorListV4 +++ b/MirrorListV4 @@ -154,7 +154,7 @@ 85.94.199.210/32 109.73.80.190/32 151.0.128.28/32 -193.206.214.14/32 +90.147.160.73/32 85.94.199.210/32 130.251.19.2/32 140.105.48.55/32 @@ -167,8 +167,8 @@ 178.17.160.48/32 178.17.160.48/32 130.89.149.21/32 -103.2.187.6/32 103.2.187.5/32 +103.2.187.6/32 163.7.134.112/32 130.89.149.21/32 130.89.149.21/32 @@ -239,17 +239,17 @@ 193.140.98.183/32 129.132.53.171/32 129.132.53.171/32 +188.184.90.134/32 +188.184.105.5/32 +188.185.65.208/32 +188.184.104.250/32 +188.184.111.122/32 188.185.29.10/32 188.184.79.248/32 -188.184.91.52/32 188.184.23.33/32 +188.184.91.52/32 188.185.8.192/32 -188.184.90.134/32 -188.184.111.122/32 -188.184.105.5/32 -188.184.104.250/32 188.185.25.162/32 -188.185.65.208/32 83.166.143.42/32 83.166.143.43/32 109.202.202.202/32 @@ -264,8 +264,8 @@ 90.207.225.196/32 94.229.65.150/32 213.230.211.73/32 -93.93.131.18/32 46.235.229.21/32 +93.93.131.18/32 163.1.160.163/32 163.1.221.67/32 80.87.134.17/32 @@ -274,24 +274,24 @@ 81.179.123.56/32 185.28.240.10/32 5.180.211.190/32 -64.50.236.52/32 -208.80.154.139/32 -64.50.233.100/32 64.50.233.100/32 64.50.236.52/32 208.80.154.139/32 +208.80.154.139/32 +64.50.233.100/32 +64.50.236.52/32 92.119.16.152/32 -4.153.4.61/32 +20.61.228.89/32 128.180.2.105/32 128.30.3.141/32 128.226.118.14/32 -128.226.118.13/32 128.226.118.15/32 128.226.118.12/32 +128.226.118.13/32 108.61.5.92/32 64.50.236.52/32 -64.50.233.100/32 140.211.166.134/32 +64.50.233.100/32 128.135.10.29/32 77.247.126.176/32 108.86.224.23/32 diff --git a/README.md b/README.md index d2bd51e..926d66b 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ It scrapes URL's of debian mirrors for later use in opnsense as an alias that on I'll be trying to maintain up to date list, aka just run a docker container and forget about it propably. +Also includes IPs for security.debian.org ## Run at home diff --git a/code/main.log b/code/main.log new file mode 100644 index 0000000..92e4e55 --- /dev/null +++ b/code/main.log @@ -0,0 +1,346 @@ +Waiting... +Waiting... +Waiting... +Starting lookup +213.129.232.18 +82.209.230.71 +213.129.232.18 +144.208.213.156 +83.164.133.195 +89.106.208.14 +213.129.232.18 +129.27.3.13 +46.102.157.26 +195.234.45.114 +195.234.45.114 +193.138.101.179 +193.190.198.27 +195.234.45.114 +185.111.204.146 +200.236.31.3 +200.236.31.3 +200.236.31.3 +200.237.203.89 +170.233.231.184 +143.106.7.135 +143.208.160.8 +200.133.233.210 +62.44.96.11 +62.44.96.11 +212.50.0.19 +195.85.215.251 +185.117.82.66 +84.43.191.5 +217.79.83.126 +62.44.96.11 +87.121.121.4 +78.128.80.70 +78.128.80.69 +207.210.46.249 +207.210.46.249 +199.188.220.121 +207.210.46.249 +129.97.134.71 +208.89.84.55 +99.199.64.121 +137.82.116.21 +138.204.231.181 +45.125.0.6 +138.204.231.181 +190.93.84.7 +190.97.169.220 +138.186.10.35 +138.204.231.181 +146.83.205.200 +161.53.160.11 +161.53.160.11 +161.53.160.11 +213.191.133.160 +78.128.211.127 +78.128.211.127 +81.91.81.11 +95.168.211.41 +147.32.160.17 +78.128.211.127 +147.32.127.196 +147.228.57.10 +147.229.176.19 +89.102.0.150 +195.113.250.60 +217.31.202.63 +194.71.11.165 +194.71.11.163 +194.71.11.163 +194.71.11.165 +46.30.211.12 +130.225.254.116 +77.247.64.34 +194.71.11.165 +194.71.11.163 +194.71.11.163 +194.71.11.165 +195.140.195.56 +193.166.3.3 +212.27.32.66 +212.27.32.66 +46.105.185.24 +213.32.5.7 +145.238.186.56 +193.48.57.38 +212.27.32.66 +193.55.175.161 +149.62.156.14 +82.67.51.130 +147.94.19.20 +132.227.74.17 +77.95.64.41 +194.167.156.234 +193.49.184.24 +130.79.200.5 +194.214.218.193 +80.93.84.15 +80.67.163.159 +194.254.245.145 +136.243.89.31 +62.138.222.4 +129.102.1.37 +137.226.34.46 +141.76.2.4 +45.125.0.6 +137.226.34.46 +141.76.2.4 +193.175.72.15 +141.76.2.4 +85.25.128.62 +62.201.161.86 +129.187.10.100 +194.8.197.22 +134.169.192.5 +91.199.118.172 +147.142.19.60 +131.188.12.211 +134.76.12.6 +137.226.34.46 +80.237.136.138 +129.143.116.10 +212.201.68.60 +212.201.68.61 +134.109.228.1 +139.174.32.6 +132.180.8.60 +130.75.2.22 +131.246.123.4 +134.93.178.166 +129.69.0.41 +129.69.0.42 +217.243.224.144 +212.83.32.30 +5.1.73.59 +37.58.58.140 +185.3.234.216 +217.72.206.21 +139.20.16.130 +194.29.226.88 +185.41.106.155 +82.98.66.230 +62.133.35.14 +213.202.193.253 +213.209.102.29 +194.95.104.50 +109.69.69.17 +78.129.164.123 +78.129.164.123 +185.165.170.20 +85.94.199.210 +203.178.137.175 +153.127.75.11 +210.117.237.2 +85.94.199.210 +109.73.80.190 +151.0.128.28 +90.147.160.73 +85.94.199.210 +130.251.19.2 +140.105.48.55 +158.129.159.169 +158.129.159.169 +158.129.159.169 +83.171.27.40 +91.211.244.15 +178.17.160.48 +178.17.160.48 +178.17.160.48 +130.89.149.21 +103.2.187.5 +103.2.187.6 +163.7.134.112 +130.89.149.21 +130.89.149.21 +23.151.136.174 +185.244.24.35 +83.137.149.3 +109.200.196.213 +85.159.239.121 +50.118.225.16 +185.229.191.144 +5.79.108.33 +185.15.209.238 +45.84.31.11 +78.142.193.130 +45.88.5.78 +185.183.113.131 +185.246.188.7 +194.127.172.131 +129.240.118.47 +129.240.118.47 +129.240.118.47 +153.19.251.221 +153.19.251.221 +149.156.96.11 +193.219.28.2 +150.254.173.17 +153.19.251.222 +193.136.216.34 +85.143.112.112 +193.136.216.34 +193.136.216.34 +193.137.214.36 +193.136.164.6 +23.147.168.189 +195.80.174.186 +195.80.174.186 +91.221.4.48 +88.212.10.12 +195.80.174.186 +213.129.232.18 +213.129.232.18 +130.89.148.12 +130.89.148.12 +80.64.47.13 +193.145.15.20 +95.20.11.14 +193.146.32.81 +147.83.91.172 +150.214.5.134 +193.144.61.75 +91.132.103.246 +193.146.75.19 +155.210.4.97 +82.194.78.250 +194.71.11.165 +194.71.11.163 +194.71.11.163 +194.71.11.165 +130.235.34.30 +193.11.30.180 +194.71.11.163 +194.71.11.165 +194.132.225.213 +94.103.202.216 +109.74.12.226 +129.132.53.171 +140.110.240.80 +193.140.98.183 +129.132.53.171 +129.132.53.171 +188.184.90.134 +188.184.105.5 +188.185.65.208 +188.184.104.250 +188.184.111.122 +188.185.29.10 +188.184.79.248 +188.184.23.33 +188.184.91.52 +188.185.8.192 +188.185.25.162 +83.166.143.42 +83.166.143.43 +109.202.202.202 +212.25.8.232 +185.73.240.250 +89.145.166.16 +78.129.164.123 +78.129.164.123 +83.170.94.3 +78.158.65.70 +78.129.164.123 +90.207.225.196 +94.229.65.150 +213.230.211.73 +46.235.229.21 +93.93.131.18 +163.1.160.163 +163.1.221.67 +80.87.134.17 +85.13.241.50 +212.219.56.184 +81.179.123.56 +185.28.240.10 +5.180.211.190 +64.50.233.100 +64.50.236.52 +208.80.154.139 +208.80.154.139 +64.50.233.100 +64.50.236.52 +92.119.16.152 +20.61.228.89 +128.180.2.105 +128.30.3.141 +128.226.118.14 +128.226.118.15 +128.226.118.12 +128.226.118.13 +108.61.5.92 +64.50.236.52 +140.211.166.134 +64.50.233.100 +128.135.10.29 +77.247.126.176 +108.86.224.23 +15.204.41.243 +204.157.3.70 +161.129.154.250 +184.105.240.111 +76.252.192.212 +216.127.35.166 +148.137.11.75 +192.158.27.72 +206.82.17.213 +141.219.180.70 +104.189.183.57 +162.255.118.133 +169.229.200.70 +208.100.4.53 +69.166.55.80 +208.80.154.139 +142.147.88.7 +23.145.168.14 +207.244.94.80 +185.142.32.136 +74.208.240.17 +94.154.159.241 +128.211.151.252 +138.247.115.248 +200.14.116.3 +190.105.216.42 +45.162.204.37 +185.37.252.138 +212.205.74.89 +152.66.115.246 +45.67.159.244 +89.111.47.130 +91.220.43.19 +185.242.104.18 +132.248.59.73 +37.251.174.43 +81.196.9.142 +89.213.174.152 +91.188.226.250 +188.241.222.52 +5.154.224.26 +5.83.47.15 +176.124.104.176 +185.100.87.86 +164.73.233.2 diff --git a/code/main.py b/code/main.py index f055b8b..f4cc125 100644 --- a/code/main.py +++ b/code/main.py @@ -2,12 +2,14 @@ import requests, schedule, time from bs4 import BeautifulSoup from whatDomain import * + +DEBSECURITYURL = ["https://security.debian.org/debian-security/"] DEBMIRRORURL = "https://www.debian.org/mirror/list" IPv4FILE = "../MirrorListV4" IPv6FILE = "../MirrorListV6" -# Define EU and American countries +# Define EU and American countries as well as Security for security updates target_countries = set([ # Europe "Austria", "Belgium", "Bulgaria", "Croatia", "Czech Republic", "Denmark", @@ -17,7 +19,9 @@ target_countries = set([ "United Kingdom", "Moldova", # America "Argentina", "Brazil", "Canada", "Chile", "Colombia", "Costa Rica", "Ecuador", - "Mexico", "Peru", "United States", "Uruguay", "Venezuela" + "Mexico", "Peru", "United States", "Uruguay", "Venezuela", + # Others + "Security" ]) @@ -79,6 +83,8 @@ def sanitizeUrlsGodWhatTheFuckIsThis(SoupInput: BeautifulSoup): outMirrorDict[current_country] = [] outMirrorDict[current_country].append(url) + outMirrorDict.update({"Security": DEBSECURITYURL}) + return outMirrorDict def LeJob(): @@ -111,7 +117,7 @@ def LeJob(): continue for key, ip in ip4Dict.items(): - # print(ip) + print(ip) fW.write(ip + "/32" + "\n") @@ -140,7 +146,7 @@ def LeJob(): # schedule.every().day.at("12:45").do(LeJob) -schedule.every().day.at("12:40").do(LeJob) +schedule.every().day.at("17:44").do(LeJob) while True: schedule.run_pending() diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 2b06201..ff8791f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -4,7 +4,7 @@ services: debmirup: container_name: Debian_Mirrors_Updater build: ./ - image: debmirrorupd:V1 + image: debmirrorupd:V1.1 environment: - DEBMIRRORURL=https://www.debian.org/mirror/list - GITEA_TOKEN= diff --git a/docker/mainDocker.py b/docker/mainDocker.py index 56245ab..f976bef 100644 --- a/docker/mainDocker.py +++ b/docker/mainDocker.py @@ -8,11 +8,12 @@ if os.environ["DEBMIRRORURL"]: else: DEBMIRRORURL = "https://www.debian.org/mirror/list" +DEBSECURITYURL = ["https://security.debian.org/debian-security/"] IPv4FILE = "/etc/debmirror/MirrorListV4" IPv6FILE = "/etc/debmirror/MirrorListV6" -# Define EU and American countries +# Define EU and American countries as well as Security for security updates target_countries = set([ # Europe "Austria", "Belgium", "Bulgaria", "Croatia", "Czech Republic", "Denmark", @@ -22,7 +23,9 @@ target_countries = set([ "United Kingdom", "Moldova", # America "Argentina", "Brazil", "Canada", "Chile", "Colombia", "Costa Rica", "Ecuador", - "Mexico", "Peru", "United States", "Uruguay", "Venezuela" + "Mexico", "Peru", "United States", "Uruguay", "Venezuela", + # Others + "Security" ]) @@ -84,6 +87,8 @@ def sanitizeUrlsGodWhatTheFuckIsThis(SoupInput: BeautifulSoup): outMirrorDict[current_country] = [] outMirrorDict[current_country].append(url) + outMirrorDict.update({"Security": DEBSECURITYURL}) + return outMirrorDict def LeJob():