Old master

TODO.md

@@ -0,0 +1,7 @@
+static arp vio0
+
+arp sentinel
+
+
+
+pf tag ipsec x gre

data/GRE-TABLE.sql

@@ -0,0 +1,33 @@
+CREATE TABLE [GRE] (  
+	[HOST-SRCID] NVARCHAR(30) ,  
+	[PTP] NVARCHAR(5) PRIMARY KEY,  
+	[PTP-NETWORK] NVARCHAR(16),
+	[PTP-LATENCY] INTEGER,
+	[INTERFACE] NVARCHAR(13),
+	[COST] INTEGER,
+	[HOPCOST] INTEGER
+);  
+
+INSERT INTO GRE (HOST-SRCID, PTP, PTP-NETWORK, PTP-LATENCY, INTERFACE, COST, HOPCOST)
+VALUES
+	("[email protected]", "ES-FR", "10.10.10.252/30", 24, "tun0", 12, 0),
+	("[email protected]", "ES-UK", "10.10.10.228/30", 35, "tun3", 17, 0),
+	("[email protected]", "ES-US", "10.10.10.236/30", 139, "tun1", 70, 0),
+	("[email protected]", "ES-JP", "10.10.10.232/30", 267, "tun2", 133, 0),
+	("[email protected]", "FR-ES", "10.10.10.252/30", 24, "gre-tunnel1", 12, 0),
+	("[email protected]", "FR-UK", "10.10.10.248/30", 6, "gre-tunnel2", 3, 13),
+	("[email protected]", "FR-US", "10.10.10.244/30", 109, "gre-tunnel4", 55, 65),
+	("[email protected]", "FR-JP", "10.10.10.240/30", 231, "gre-tunnel3", 115, 125),
+	("[email protected]", "UK-ES", "10.10.10.228/30", 35, "gre1", 17, 0),
+	("[email protected]", "UK-FR", "10.10.10.248/30", 6, "gre0", 3, 13),
+	("[email protected]", "UK-US", "10.10.10.225/30", 105, "gre2", 52, 62),
+	("[email protected]", "UK-JP", "10.10.10.114/30", 244, "gre3", 122, 132),
+	("[email protected]", "JP-ES", "10.10.10.232/30", 267, "gre12", 133, 0),
+	("[email protected]", "JP-FR", "10.10.10.240/30", 231, "gre0", 115, 125),
+	("[email protected]", "JP-US", "10.10.10.118/30", 151, "gre2", 75, 0),
+	("[email protected]", "JP-UK", "10.10.10.114/30", 244, "gre3", 122, 132),
+	("[email protected]", "US-ES", "10.10.10.236/30", 139, "gre1", 70, 0),
+	("[email protected]", "US-FR", "10.10.10.244/30", 109, "gre0", 55, 65),
+	("[email protected]", "US-UK", "10.10.10.225/30", 105, "gre2", 52, 62),
+	("[email protected]", "US-JP", "10.10.10.118/30", 151, "gre3", 75, 0);
+

git_openbsd.sh

@@ -2,7 +2,15 @@
 
 DATE=$(date +%d%m%Y)
 DATE_RELEASE=$(date +"%d/%m/%Y %H:%m:%S")
+<<<<<<< Updated upstream
 HOMEWRK="/home/riccardo/Work/telecom.lobby"
+=======
+<<<<<<< HEAD
+HOMEWRK="/home/taglio/Work/telecom.lobby"
+=======
+HOMEWRK="/home/riccardo/Work/telecom.lobby"
+>>>>>>> master
+>>>>>>> Stashed changes
 REPO="/OpenBSD"
 RELEASE="/OpenBSD$DATE.tar"
 

installation/install-vps.conf

@@ -1,31 +1,88 @@
+<<<<<<< Updated upstream
 # autoinstall response file for unattended installation
 # https://man.openbsd.org/autoinstall
 Choose your keyboard layout = es
 System hostname = neo
+=======
+<<<<<<< HEAD
+Choose your keyboard layout = us
+System hostname = neo.telecom.lobby
+>>>>>>> Stashed changes
 Which network interface do you wish to configure = vio0
 IPv4 address for vio0 = dhcp
 IPv6 address for vio0 = autoconf
 Which network interface do you wish to configure = done
 Default IPv4 route = 
 DNS domain name = telecom.lobby
+<<<<<<< Updated upstream
 Password for root = 123456789
+=======
+Password for root = $2b$10$4tPKeRmxVyffVkrQMve70.CiPmE28khH9UXiuSYpzAKbZrOfQq0Pm
+=======
+# autoinstall response file for unattended installation
+# https://man.openbsd.org/autoinstall
+Choose your keyboard layout = es
+System hostname = neo
+Which network interface do you wish to configure = vio0
+IPv4 address for vio0 = dhcp
+IPv6 address for vio0 = autoconf
+Which network interface do you wish to configure = done
+Default IPv4 route = 
+DNS domain name = telecom.lobby
+Password for root = 123456789
+>>>>>>> master
+>>>>>>> Stashed changes
 #Public ssh key for root account = ssh key stored in /root/.ssh/authorized_keys
 Start sshd(8) by default = yes
 Do you expect to run the X Window System = no
 Setup a user = taglio
 Full name for user = Riccardo Giuntoli
+<<<<<<< Updated upstream
 Password for user = 123456789
 #Public ssh key for user = ssh key stored in ~/.ssh/authorized_keys
+=======
+<<<<<<< HEAD
+Password for user = *********
+Public ssh key for user = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOD7/j9oo9uaDzuf5z5Mwzia3TuHyrRT+IXVBGnz8tt8 [email protected]
+>>>>>>> Stashed changes
 Allow root ssh login = no
 What timezone are you in = Europe/Sofia
 Which disk is the root disk = sd0
 # see disklabel.min, disklabel, or disklabel.lax
+<<<<<<< Updated upstream
 URL to autopartitioning template for disklabel = https://raw.githubusercontent.com/redeltaglio/OpenBSD/master/installation/disklabel-vps
+=======
+URL to autopartitioning template for disklabel = https://raw.githubusercontent.com/redeltaglio/OpenBSD/master/installation/customdisklabel
+=======
+Password for user = 123456789
+#Public ssh key for user = ssh key stored in ~/.ssh/authorized_keys
+Allow root ssh login = no
+What timezone are you in = Europe/Sofia
+Which disk is the root disk = sd0
+# see disklabel.min, disklabel, or disklabel.lax
+URL to autopartitioning template for disklabel = https://raw.githubusercontent.com/redeltaglio/OpenBSD/master/installation/disklabel-vps
+>>>>>>> master
+>>>>>>> Stashed changes
 Unable to connect using https. Use http instead = yes
 Location of sets = http
 HTTP proxy URL = none
 HTTP Server = cdn.openbsd.org
+<<<<<<< Updated upstream
+Server directory = pub/OpenBSD/6.8/amd64
+Set name(s) = -x*
+# or minimum sets (disklabel.min)
+#Set name(s) = -comp* -game* -x*
+=======
+<<<<<<< HEAD
+Server directory = pub/OpenBSD/7.1/amd64
+#Set name(s) = -x*
+# or minimum sets (disklabel.min)
+Set name(s) = -comp* -x*
+Continue without verification = yes
+=======
 Server directory = pub/OpenBSD/6.8/amd64
 Set name(s) = -x*
 # or minimum sets (disklabel.min)
 #Set name(s) = -comp* -game* -x*
+>>>>>>> master
+>>>>>>> Stashed changes