From dc374ab7b4dc45f98df931329d54288047821a71 Mon Sep 17 00:00:00 2001 From: "painpain@minty" Date: Mon, 2 Feb 2026 17:41:02 +0100 Subject: [PATCH] all files written as modified, but git diff is empty --- install/apt.sh | 4 -- install/arch.sh | 14 +++++- install/tree_cpy.sh | 1 - net/blacklist.txt | 80 ++++------------------------------- net/whitelist.txt | 65 +++------------------------- usr/bin/alpine-qemu-install | 1 + usr/bin/clone | 4 +- usr/bin/p | 4 +- usr/etc/systemd/resolved.conf | 9 ++-- 9 files changed, 34 insertions(+), 148 deletions(-) diff --git a/install/apt.sh b/install/apt.sh index 2e83ad3..0cb5350 100755 --- a/install/apt.sh +++ b/install/apt.sh @@ -31,10 +31,6 @@ apt install -y pip apt install -y curl apt install -y tree apt install -y ffmpeg -apt install -y ffmpeg -apt install -y nft -apt install -y openvpn - #apt install -y vlc #apt install -y terminator #apt install -y gimp diff --git a/install/arch.sh b/install/arch.sh index edacbcf..bc88433 100755 --- a/install/arch.sh +++ b/install/arch.sh @@ -12,15 +12,25 @@ fi MACHINE_DIR=${1:-"svr"} bash tree_cpy.sh $MACHINE_DIR/usr +# append sources +bash config.sh source /home/.bashrc bash config.sh source /home/.bashrc -#bash python.sh -#source /home/.bashrc bash chmod.sh +# append sources bash pacman.sh source /home/.bashrc bash network.sh +#systemctl enable --now NetworkManager #enable dongle + +#pacman --noconfirm -Syu ulogd +#NETWORKDIR="$MACHINE_DIR/networking" +##TOR_LIST=$NETWORKDIR/tor_list.txt +##curl https://www.dan.me.uk/torlist/?full= > $TOR_LIST +#systemctl enable ulogd +#systemctl start ulogd +#bash $NETWORKDIR/iptables_script.sh -f $NETWORKDIR/ip_to_ban.txt -r diff --git a/install/tree_cpy.sh b/install/tree_cpy.sh index 9a7ccd1..1187386 100755 --- a/install/tree_cpy.sh +++ b/install/tree_cpy.sh @@ -4,7 +4,6 @@ USR_DIR=${1:-"no_dir"} [[ $USR_DIR == "no_dir" ]] && \ echo "usage $0 usr_dir" && \ exit 1 - USR_DIR=$(realpath $USR_DIR) #uses ssymbolic link otherwise crossdevice troubles diff --git a/net/blacklist.txt b/net/blacklist.txt index 80a89a9..6fdc6e4 100755 --- a/net/blacklist.txt +++ b/net/blacklist.txt @@ -1,102 +1,38 @@ -#Make crash archinstall -8.8.8.8 -70.27.250.39 -94.105.98.61 -129.97.134.71 -185.21.134.11 -159.195.6.177 -172.65.90.7 -193.121.15.225 - 34.0.0.0/8 35.0.0.0/8 -#OVH -37.59.32.0/19 - -#Microsoft -#40.114.177.156 -> lilie.duckdns.org, holland -40.96.0.0/12 - -#Hetzner (arch install) -46.62.192.0/22 - -#Staples us (arch install) -50.74.152.24/29 - -# apparait apres avoir bloque 2 adresses google intrusives sud firefox -95.216.0.0/16 +#SKYCA-3#Owner:Fastly +151.101.0.0/16 #NETBLK Cox 98.174.32.0/19 -#Cloud flare chatgpt -#104.16.0.0/12 - +#OVH +37.59.32.0/19 #oman#mobile 134.0.192.0/20 -#cloudflare eu (arch install) # RIPE # http addr 141.0.0.0/8 -#Google -142.250.0.0/15 - -#Fastly ip geolocalisation (arch install) -146.75.0.0/20 - -#SKYCA-3#Owner:Fastly #pip atproto ? 151.101.0.0/16 -#OVH france -188.165.192.0/18 - -#Amsterdam, possiblement a Linz il y a quelques annees -193.0.0.0/20 - -#oman#mobile -#134.0.192.0/20 - -#cloudflare eu (arch install) -# RIPE -# http addr -#141.0.0.0/8 - -#Google -142.250.0.0/15 - -#Fastly ip geolocalisation (arch install) -146.75.0.0/20 - -#SKYCA-3#Owner:Fastly -#pip atproto ? -#151.101.0.0/16 - -#OVH france -188.165.192.0/18 - -#Amsterdam, possiblement a Linz il y a quelques annees -193.0.0.0/20 +#Cloud flare chatgpt +#104.16.0.0/12 #Umea ftp archive (debian) #194.71.11.0/24 #Fastly Skyca -#199.232.0.0/16 +199.232.0.0/16 #LEVEL3-CIDR #209.244.0.0/14 #ionos #212.227.232.161 lors dúnse installation arch -#212.227.232.0/24 +212.227.232.0/24 1.0.0.1 - -#lancement firefox -fe80::b08c:e0ff:fe6d:542c/64 -ff02::0/48 -#ff02::1:ffbc:c929/120 diff --git a/net/whitelist.txt b/net/whitelist.txt index b17b972..413602e 100755 --- a/net/whitelist.txt +++ b/net/whitelist.txt @@ -1,69 +1,14 @@ -#local -10.0.0.0/8 -192.168.0.0/8 - -#microsoft (github) -#20.0.0.0/11 - -#winamax -34.96.80.159 - -#Paypal -#34.107.221.82 - -#ipinfo.io -34.117.59.81 - -#ifconfig.me -34.160.111.145 - -#plufinfirefox -34.120.208.123 - -#gitea -34.217.253.146 -35.91.213.186 - -#dns -66.28.0.61 - -#Thesuissbay -85.195.200.187 - -#ChatGpt -104.18.32.47 - -#lb.ludd.ltu.se #mirror -130.240.16.130 - -#ch.mirrors.cicku.me -141.101.90.119 - #Paypal 151.101.129.21 - -#paiement infomaniak -151.101.38.4 - -#dl-cdn.alpinelinux.org -151.101.10.132 - -#plugin firefox -151.101.193.91 - -#deb.debian.org -151.101.2.132 -151.101.66.132 -151.101.130.132 -151.101.194.132 -2a04:4e42:200::644 +34.107.221.82 #sigmanet#codium 178.238.223.0/24 +#gititea +34.217.253.146 -#infania pacman repo -#ftpmirror.infania.net -194.132.225.213 +#microsoft (github) +#20.0.0.0/11 #whois 199.212.0.0/24 diff --git a/usr/bin/alpine-qemu-install b/usr/bin/alpine-qemu-install index 10b35a9..d64dff0 100755 --- a/usr/bin/alpine-qemu-install +++ b/usr/bin/alpine-qemu-install @@ -39,6 +39,7 @@ echo "iso = $ISO" qemu-system-x86_64 \ -m $RAM \ + -nic user \ -boot once=d \ -cdrom $ISO \ -drive file=$IMG \ diff --git a/usr/bin/clone b/usr/bin/clone index a261c4a..3149206 100755 --- a/usr/bin/clone +++ b/usr/bin/clone @@ -1,14 +1,14 @@ #!/bin/bash clone () { - DEFAULT_ADDR="" - BASE="ssh://git@6.tcp.eu.ngrok.io:11272" + URL=ssh://git@6.tcp.eu.ngrok.io:11272 if [ $# -ne "1" ]; then PROFIL_NAME="$1"; PROJECT_NAME="$2"; else PROFIL_NAME="painpain"; PROJECT_NAME="$1"; + git clone --recurse-submodules git@github.com:pain-pin/$PROJECT_NAME.git; fi git clone --recurse-submodules ${BASE}/$PROFIL_NAME/$PROJECT_NAME.git; } diff --git a/usr/bin/p b/usr/bin/p index cbe0b79..443611b 100755 --- a/usr/bin/p +++ b/usr/bin/p @@ -1,4 +1,6 @@ #!/usr/bin/bash -ping -c1 9.9.9.9 +ping -c1 | grep transmit + +exit 0 diff --git a/usr/etc/systemd/resolved.conf b/usr/etc/systemd/resolved.conf index 8de8267..68fcb8d 100755 --- a/usr/etc/systemd/resolved.conf +++ b/usr/etc/systemd/resolved.conf @@ -1,4 +1,3 @@ -<<<<<<< HEAD # This file is part of systemd. -> systemctl enable --now systemd-resolved # # systemd is free software; you can redistribute it and/or modify it under the @@ -19,9 +18,9 @@ [Resolve] # Some examples of DNS servers which may be used for DNS= and FallbackDNS=: -DNS=1.1.1.1 2606:4700:4700::1111 2606:4700:4700::1001 +DNS=1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001 #cloudflare-dns.com # Quad9: 9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net -FallbackDNS=185.253.5.0 2a0f:fc80:: 2a0f:fc81:: +FallbackDNS=193.110.81.0 185.253.5.0 2a0f:fc80:: 2a0f:fc81:: #dns0.eu # # Using DNS= configures global DNS servers and does not suppress link-specific # configuration. Parallel requests will be sent to per-link DNS servers @@ -31,7 +30,7 @@ FallbackDNS=185.253.5.0 2a0f:fc80:: 2a0f:fc81:: #DNS= #FallbackDNS=9.9.9.9#dns.quad9.net 2620:fe::9#dns.quad9.net 1.1.1.1#cloudflare-dns.com 2606:4700:4700::1111#cloudflare-dns.com 8.8.8.8#dns.google 2001:4860:4860::8888#dns.google #Domains= -DNSSEC=allow-downgrade +DNSSEC=yes DNSOverTLS=yes MulticastDNS=yes LLMNR=yes @@ -43,5 +42,3 @@ ReadEtcHosts=yes #ResolveUnicastSingleLabel=no #StaleRetentionSec=0 #RefuseRecordTypes= -======= ->>>>>>> d378d2f ( /!\ Big Merge REBASING)