Changes in 0f15f2d: Merge branch 'master' of ssh://dn42.us/dn42/wiki Conflicts: howto/Bird-communities.md howto/Bird.md

				Anycast-Wiki.md
			
          @@ -0,0 +1,7 @@

          +watchdog-script: http://paste42.de/7975/

          +

          +

          +exabgp runs directly on the web server and peers with border-routers, configuration: http://paste42.de/7976/

          +

          +

          +bird is set up like this: http://paste42.de/7977/

          \ No newline at end of file

				howto/Bird-communities.md
			
          @@ -4,9 +4,15 @@ Communities can be used to prioritize traffic based on different flags, in DN42 

           The community is applied to the route when it is imported and exported, therefore you need to change your bird configuration, in /etc/bird/peers4 if you followed the [Bird](/howto/Bird) guide. 

          +<<<<<<< HEAD

           The calculations for finding the best route can be stored in a separate file, for example /etc/bird/community_filters.conf.

           Below, you will see an example config for peers4 as well as the and the suggested improvement by tombii (prefers low latency) to original filter implementation by welterde (prefers high BW over low latency).

          +=======

          +The filter helpers can be stored in a separate file, for example /etc/bird/community_filters.conf.

          +

          +Below, you will see an example config for peers4 based on the original filter implementation by Jplitza.

          +>>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d

           To properly assign the right community to your peer, please reference the table below. If you are running your own network and peering internally, please also apply the communities inside your network.

          @@ -104,7 +110,10 @@ latency = update_latency(link_latency);

           bandwidth = update_bandwidth(link_bandwidth) - 20;

           crypto = update_crypto(link_crypto) - 30;

           if bandwidth > 4 then bandwidth = 4;

          +<<<<<<< HEAD

           bgp_local_pref = 100*bandwidth + 100*(10-latency)-100*bgp_path.len+50*crypto;

          +=======

          +>>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d

           return true;

           } 

           ```

          @@ -114,12 +123,27 @@ Please remember to include /etc/bird/community_filters.conf in your bird.conf/bi

           #################

           include "/etc/bird/filter4.conf";

          +<<<<<<< HEAD

           **include "/etc/bird/community_filters.conf";**

          +=======

          +include "/etc/bird/community_filters.conf"; 

          +>>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d

           ```

           ***

          +<<<<<<< HEAD

          +=======

          +### Bird bgp_local_pref calculation

          +If you are running a bigger network and also want to prioritize your traffic based on the communities, then you can look at the following below:

          +```

          +bgp_local_pref = 10000+100*bandwidth + 50*(10-latency)-200*bgp_path.len+100*crypto; (as suggested by tombii)

          +bgp_local_pref = 1000*bandwidth - 10*latency; if crypto < 2 then bgp_local_pref = 0; (as suggested by Jplitza)

          +```

          +This calculation goes into the /etc/bird/community_filters.conf  just above the return true; line. However for starters I recommend to skip the bgp_local_pref calculation part until you fully unterstand BGP routing and how this will affect not only you but the whole network. Assigning community flags to your peerings will hoever have an impact on dn42 in total. Remember, probably none of these alternatives are a good fit for your network, you will need to apply one and see how it affects your traffic and then going back and tweaking the formula and checking again.

          +

          +>>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d

           Original implementation by Jplitza: https://gist.github.com/welterde/524cc9b37a618e29093d

           All props to him for the bird code based on the suggestion from welterde.

				howto/Bird.md
			
          @@ -24,11 +24,6 @@ protocol static {

             route <SUBNET> reject;

           };

          -# filter helpers

          -#################

          -

          -include "/etc/bird/filter4.conf";

          -

           # local configuration

           ######################

          @@ -36,6 +31,11 @@ include "/etc/bird/filter4.conf";

           # so this configuration can be reused on multiple routers in your network

           include "/etc/bird/local4.conf";

          +# filter helpers

          +#################

          +

          +include "/etc/bird/filter4.conf";

          +

           # Kernel routing tables

           ########################

          @@ -166,16 +166,16 @@ protocol device {

             scan time 10;

           }

          -# filter helpers

          -#################

          -

          -include "/etc/bird/filter6.conf";

          -

           # local configuration

           ######################

           include "bird/local6.conf";

          +# filter helpers

          +#################

          +

          +include "/etc/bird/filter6.conf";

          +

           # Kernel routing tables

           ########################

          @@ -318,7 +318,12 @@ function is_valid_network() {

           ```

           # Bird communities

          +<<<<<<< HEAD

           Communities can be used to prioritize traffic based on different flags, in DN42 we are using communities to prioritize based on latency, bandwidth and encryption. More information can be found [here](/howto/Bird-communities). 

          +=======

          +Communities can be used to prioritize traffic based on different flags, in DN42 we are using communities to prioritize based on latency, bandwidth and encryption. It is really easy to get started with communities and we encourage all of you to get the basic configuration done and to mark your peerings with the correct flags for improved routing.

          +More information can be found [here](/howto/Bird-communities). 

          +>>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d

           # Useful bird commmands

				internal/Internal-Services.md
			
          @@ -63,7 +63,7 @@ MWD will also provide a secondary DNS server and/or cacti monitoring of your dev

           |:------------------------------------------------- |:-------------------------------------------------------- |

           | http://img.dn42                                   | Imagehoster                                              |

           | http://chan.dn42                                  | DN42-Chan, an imageboard                                 |

          -| http://media.dn42                                 | A Mediagoblin instance (Login: dn42:dn42dn42)            |

          +| http://media.dn42                                 | A Mediagoblin instance            |

           | https://dev.0l.dn42/tvheadend/                    | Digital Video Recorder (TVHeadend frontend)              |

           | ftp://dev.0l.dn42/Videos/Recordings/              | Digital Video Recorder (Recorded files)                  |

          @@ -83,7 +83,7 @@ MWD will also provide a secondary DNS server and/or cacti monitoring of your dev

           ## File sharing

           ### Tahoe LAFS

          -Some people runs [Tahoe LAFS](services/Tahoe-LAFS) nodes to provide a secure decentralized crypted file storage cloud in dn42.

          +Some people runs [Tahoe LAFS](/services/Tahoe-LAFS) nodes to provide a secure decentralized crypted file storage cloud in dn42.

           ### FTP / HTTP

services/Certificate-Authority.md

...	...	@@ -3,7 +3,7 @@
3	3	internal.dn42 is signed by an internally maintained CA that is only allowed to sign *.dn42 domains.
4	4	If you would like to have a certificate signed by this CA send a CSR to [email protected]
5	5
6		-The CA certificate:
	6	+The CA certificate ([link](https://git.dn42/git/dn42/pki/plain/dn42-ca.crt)):
7	7
8	8	```
9	9	-----BEGIN CERTIFICATE-----

				services/Repository-Mirrors.md
			
          @@ -25,5 +25,4 @@ Hosted by:

           * Nurtic-Vibe

          -

           If you consider adding your mirror to the list, contact Nurtic-Vibe via IRC.

          \ No newline at end of file

services/Tahoe-LAFS.md

...	...	@@ -20,7 +20,7 @@ To run a node you have to install tahoe-lafs at least in version 1.10. You can g
20	20	Before the first start you have to create a node with `bin/tahoe create-node` or a client (doesn't provide storage) with `bin/tahoe create-client`. This will create the folder .tahoe in your home dir. In the file .tahoe/tahoe.cfg you have to enter on `introducer.furl` the link to our introducer node:
21	21
22	22	```
23		-introducer.furl = pb://[email protected]:44411/introducer
	23	+introducer.furl = pb://[email protected]:44411/introducer
24	24	```
25	25
26	26	With `bin/tahoe start` you start your local node.

				services/dns/Providing-Anycast-DNS.md
			
          @@ -35,7 +35,7 @@ There are a few different scripts for generating zone files. They have been writ

           | **Person**  | **Region** | **AS** | **Unicast Address**       | **Comments**       |

           |-------------|---|:------:|:----------------------------------:|--------------------|

          -| siska       |EU | 76103  | resolver.nixnodes.dn42  (172.22.177.4)  | caching, dn42-only            |

          +| siska       |SI | 76103  | resolver.nixnodes.dn42  (172.22.177.4)  | caching, dn42-only            |

           | xuu         |UT,US | 64737  | xuu.root.dn42   (172.22.141.132)   ||

           | xuu         |ON,CA | 64737  | souris.root.dn42 (172.22.141.180)  ||          

           | Nurtic-Vibe |EU | 4242420123 | ns1.grmml.dn42 (172.23.149.20) || 

          @@ -46,7 +46,8 @@ There are a few different scripts for generating zone files. They have been writ

           | hax404      | DE | 76114 | chero.hax404.dn42 (172.23.136.65) | advertised in BGP|

           | psclrnnrt   | DE | 4242420205 | nsc421.root6.dn42 (172.23.65.5) |

           | psclrnnrt   | CA | 4242420205 | nsc423.root6.dn42 (172.23.65.100) |

          -| tobee | DE,US,JP | 4242420022 | ns1.mhm.dn42 (172.23.67.1) ||

          +| tombii      | FR | 4242420321 | fr-par1.tombii.dn42 (172.23.102.4) |

          +| tombii      | SG | 4242420321 | sg-sin1.tombii.dn42 (172.23.102.65) |

           # IPv6 DNS

          @@ -63,4 +64,3 @@ There are a few different scripts for generating zone files. They have been writ

           | xuu         |ON,CA| 64737 | souris.root.dn42 (fdea:a15a:77b9:53::1) | |

           | Nurtic-Vibe |EU |4242420123 | ns1.grmml.dn42 (fd42:23:149:cccc::53)  ||

           | hax404 | DE | 76114 | chero.hax404.dn42 (fd58:eb75:347d:101::1) ||

          -| tobee | DE,US,JP | 4242420022 | ns1.mhm.dn42 (fd70:96c9:ef25::1) ||

          \ No newline at end of file

...	...	@@ -0,0 +1,7 @@
	1	+watchdog-script: http://paste42.de/7975/
	2	+
	3	+
	4	+exabgp runs directly on the web server and peers with border-routers, configuration: http://paste42.de/7976/
	5	+
	6	+
	7	+bird is set up like this: http://paste42.de/7977/
...	...	\ No newline at end of file

...	...	@@ -4,9 +4,15 @@ Communities can be used to prioritize traffic based on different flags, in DN42
4	4
5	5	The community is applied to the route when it is imported and exported, therefore you need to change your bird configuration, in /etc/bird/peers4 if you followed the [Bird](/howto/Bird) guide.
6	6
	7	+<<<<<<< HEAD
7	8	The calculations for finding the best route can be stored in a separate file, for example /etc/bird/community_filters.conf.
8	9
9	10	Below, you will see an example config for peers4 as well as the and the suggested improvement by tombii (prefers low latency) to original filter implementation by welterde (prefers high BW over low latency).
	11	+=======
	12	+The filter helpers can be stored in a separate file, for example /etc/bird/community_filters.conf.
	13	+
	14	+Below, you will see an example config for peers4 based on the original filter implementation by Jplitza.
	15	+>>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d
10	16
11	17	To properly assign the right community to your peer, please reference the table below. If you are running your own network and peering internally, please also apply the communities inside your network.
12	18
...	...	@@ -104,7 +110,10 @@ latency = update_latency(link_latency);
104	110	bandwidth = update_bandwidth(link_bandwidth) - 20;
105	111	crypto = update_crypto(link_crypto) - 30;
106	112	if bandwidth > 4 then bandwidth = 4;
	113	+<<<<<<< HEAD
107	114	bgp_local_pref = 100bandwidth + 100(10-latency)-100bgp_path.len+50crypto;
	115	+=======
	116	+>>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d
108	117	return true;
109	118	}
110	119	```
...	...	@@ -114,12 +123,27 @@ Please remember to include /etc/bird/community_filters.conf in your bird.conf/bi
114	123	#################
115	124
116	125	include "/etc/bird/filter4.conf";
	126	+<<<<<<< HEAD
117	127	include "/etc/bird/community_filters.conf";
	128	+=======
	129	+include "/etc/bird/community_filters.conf";
	130	+>>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d
118	131	```
119	132
120	133
121	134	***
122	135
	136	+<<<<<<< HEAD
	137	+=======
	138	+### Bird bgp_local_pref calculation
	139	+If you are running a bigger network and also want to prioritize your traffic based on the communities, then you can look at the following below:
	140	+```
	141	+bgp_local_pref = 10000+100bandwidth + 50(10-latency)-200bgp_path.len+100crypto; (as suggested by tombii)
	142	+bgp_local_pref = 1000bandwidth - 10latency; if crypto < 2 then bgp_local_pref = 0; (as suggested by Jplitza)
	143	+```
	144	+This calculation goes into the /etc/bird/community_filters.conf just above the return true; line. However for starters I recommend to skip the bgp_local_pref calculation part until you fully unterstand BGP routing and how this will affect not only you but the whole network. Assigning community flags to your peerings will hoever have an impact on dn42 in total. Remember, probably none of these alternatives are a good fit for your network, you will need to apply one and see how it affects your traffic and then going back and tweaking the formula and checking again.
	145	+
	146	+>>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d
123	147	Original implementation by Jplitza: https://gist.github.com/welterde/524cc9b37a618e29093d
124	148
125	149	All props to him for the bird code based on the suggestion from welterde.

...	...	@@ -24,11 +24,6 @@ protocol static {
24	24	route <SUBNET> reject;
25	25	};
26	26
27		-# filter helpers
28		-#################
29		-
30		-include "/etc/bird/filter4.conf";
31		-
32	27	# local configuration
33	28	######################
34	29
...	...	@@ -36,6 +31,11 @@ include "/etc/bird/filter4.conf";
36	31	# so this configuration can be reused on multiple routers in your network
37	32	include "/etc/bird/local4.conf";
38	33
	34	+# filter helpers
	35	+#################
	36	+
	37	+include "/etc/bird/filter4.conf";
	38	+
39	39	# Kernel routing tables
40	40	########################
41	41
...	...	@@ -166,16 +166,16 @@ protocol device {
166	166	scan time 10;
167	167	}
168	168
169		-# filter helpers
170		-#################
171		-
172		-include "/etc/bird/filter6.conf";
173		-
174	169	# local configuration
175	170	######################
176	171
177	172	include "bird/local6.conf";
178	173
	174	+# filter helpers
	175	+#################
	176	+
	177	+include "/etc/bird/filter6.conf";
	178	+
179	179	# Kernel routing tables
180	180	########################
181	181
...	...	@@ -318,7 +318,12 @@ function is_valid_network() {
318	318	```
319	319
320	320	# Bird communities
	321	+<<<<<<< HEAD
321	322	Communities can be used to prioritize traffic based on different flags, in DN42 we are using communities to prioritize based on latency, bandwidth and encryption. More information can be found [here](/howto/Bird-communities).
	323	+=======
	324	+Communities can be used to prioritize traffic based on different flags, in DN42 we are using communities to prioritize based on latency, bandwidth and encryption. It is really easy to get started with communities and we encourage all of you to get the basic configuration done and to mark your peerings with the correct flags for improved routing.
	325	+More information can be found [here](/howto/Bird-communities).
	326	+>>>>>>> 8228e6e222fe084fe7b8fff23fddf55e68668d3d
322	327
323	328	# Useful bird commmands
324	329

...	...	@@ -63,7 +63,7 @@ MWD will also provide a secondary DNS server and/or cacti monitoring of your dev
63	63	\|:------------------------------------------------- \|:-------------------------------------------------------- \|
64	64	\| http://img.dn42 \| Imagehoster \|
65	65	\| http://chan.dn42 \| DN42-Chan, an imageboard \|
66		-\| http://media.dn42 \| A Mediagoblin instance (Login: dn42:dn42dn42) \|
	66	+\| http://media.dn42 \| A Mediagoblin instance \|
67	67	\| https://dev.0l.dn42/tvheadend/ \| Digital Video Recorder (TVHeadend frontend) \|
68	68	\| ftp://dev.0l.dn42/Videos/Recordings/ \| Digital Video Recorder (Recorded files) \|
69	69
...	...	@@ -83,7 +83,7 @@ MWD will also provide a secondary DNS server and/or cacti monitoring of your dev
83	83	## File sharing
84	84
85	85	### Tahoe LAFS
86		-Some people runs [Tahoe LAFS](services/Tahoe-LAFS) nodes to provide a secure decentralized crypted file storage cloud in dn42.
	86	+Some people runs [Tahoe LAFS](/services/Tahoe-LAFS) nodes to provide a secure decentralized crypted file storage cloud in dn42.
87	87
88	88	### FTP / HTTP
89	89

...	...	@@ -25,5 +25,4 @@ Hosted by:
25	25	* Nurtic-Vibe
26	26
27	27
28		-
29	28	If you consider adding your mirror to the list, contact Nurtic-Vibe via IRC.
...	...	\ No newline at end of file

...	...	@@ -35,7 +35,7 @@ There are a few different scripts for generating zone files. They have been writ
35	35
36	36	\| Person \| Region \| AS \| Unicast Address \| Comments \|
37	37	\|-------------\|---\|:------:\|:----------------------------------:\|--------------------\|
38		-\| siska \|EU \| 76103 \| resolver.nixnodes.dn42 (172.22.177.4) \| caching, dn42-only \|
	38	+\| siska \|SI \| 76103 \| resolver.nixnodes.dn42 (172.22.177.4) \| caching, dn42-only \|
39	39	\| xuu \|UT,US \| 64737 \| xuu.root.dn42 (172.22.141.132) \|\|
40	40	\| xuu \|ON,CA \| 64737 \| souris.root.dn42 (172.22.141.180) \|\|
41	41	\| Nurtic-Vibe \|EU \| 4242420123 \| ns1.grmml.dn42 (172.23.149.20) \|\|
...	...	@@ -46,7 +46,8 @@ There are a few different scripts for generating zone files. They have been writ
46	46	\| hax404 \| DE \| 76114 \| chero.hax404.dn42 (172.23.136.65) \| advertised in BGP\|
47	47	\| psclrnnrt \| DE \| 4242420205 \| nsc421.root6.dn42 (172.23.65.5) \|
48	48	\| psclrnnrt \| CA \| 4242420205 \| nsc423.root6.dn42 (172.23.65.100) \|
49		-\| tobee \| DE,US,JP \| 4242420022 \| ns1.mhm.dn42 (172.23.67.1) \|\|
	49	+\| tombii \| FR \| 4242420321 \| fr-par1.tombii.dn42 (172.23.102.4) \|
	50	+\| tombii \| SG \| 4242420321 \| sg-sin1.tombii.dn42 (172.23.102.65) \|
50	51
51	52	# IPv6 DNS
52	53
...	...	@@ -63,4 +64,3 @@ There are a few different scripts for generating zone files. They have been writ
63	64	\| xuu \|ON,CA\| 64737 \| souris.root.dn42 (fdea:a15a:77b9:53::1) \| \|
64	65	\| Nurtic-Vibe \|EU \|4242420123 \| ns1.grmml.dn42 (fd42:23:149:cccc::53) \|\|
65	66	\| hax404 \| DE \| 76114 \| chero.hax404.dn42 (fd58:eb75:347d:101::1) \|\|
66		-\| tobee \| DE,US,JP \| 4242420022 \| ns1.mhm.dn42 (fd70:96c9:ef25::1) \|\|
...	...	\ No newline at end of file