Last active
May 1, 2018 20:36
-
-
Save SvenRoederer/fb70b6937378ca9340557c6bd3e8c88a to your computer and use it in GitHub Desktop.
configuration-diff between Kathleen0.3.0 and Hedy-1.0.0
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -uNr base-100/etc/config/batman-adv 030-with-cb20306/etc/config/batman-adv | |
--- base-100/etc/config/batman-adv 2018-02-20 10:50:38.000000000 +0100 | |
+++ 030-with-cb20306/etc/config/batman-adv 2017-04-10 12:05:12.000000000 +0200 | |
@@ -9,6 +9,7 @@ | |
option 'gw_sel_class' | |
option 'log_level' | |
option 'orig_interval' | |
+ option 'vis_mode' | |
option 'bridge_loop_avoidance' | |
option 'distributed_arp_table' | |
option 'multicast_mode' | |
diff -uNr base-100/etc/config/defaults 030-with-cb20306/etc/config/defaults | |
--- base-100/etc/config/defaults 2018-03-05 20:53:56.000000000 +0100 | |
+++ 030-with-cb20306/etc/config/defaults 2018-03-11 09:30:36.000000000 +0100 | |
@@ -3,9 +3,10 @@ | |
option dhcp '1' | |
option firewall '1' | |
option network '1' | |
option iproute '1' | |
option olsrd '1' | |
option luci_statistics '1' | |
option uhttpd '1' | |
option vpn03_openvpn '1' | |
+ option openvpn '1' | |
diff -uNr base-100/etc/config/ffwizard 030-with-cb20306/etc/config/ffwizard | |
--- base-100/etc/config/ffwizard 2018-03-05 20:58:12.000000000 +0100 | |
+++ 030-with-cb20306/etc/config/ffwizard 2017-04-10 12:09:30.000000000 +0200 | |
@@ -4,6 +4,7 @@ | |
option usersBandwidthUp '1' | |
option usersBandwidthDown '5' | |
option enableStats '1' | |
+ option private_ap '0' | |
option ssid 'berlin.freifunk.net' | |
option dhcpmesh '10.230.197.209/28' | |
option meship_radio0 '10.31.21.125' | |
diff -uNr base-100/etc/config/firewall 030-with-cb20306/etc/config/firewall | |
--- base-100/etc/config/firewall 2018-03-05 20:58:12.000000000 +0100 | |
+++ 030-with-cb20306/etc/config/firewall 2018-03-11 09:30:38.000000000 +0100 | |
@@ -116,116 +108,15 @@ | |
option dest 'freifunk' | |
option src 'wan' | |
config zone 'zone_ffuplink' | |
option name 'ffuplink' | |
option input 'REJECT' | |
option forward 'ACCEPT' | |
option output 'ACCEPT' | |
option network 'ffuplink' | |
option masq '0' | |
config forwarding 'fwd_ff_ffuplink' | |
option src 'freifunk' | |
option dest 'ffuplink' | |
-config forwarding | |
- option dest 'freifunk' | |
- option src 'lan' | |
- | |
-config forwarding | |
- option dest 'freifunk' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option proto 'icmp' | |
- option target 'ACCEPT' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option dest_port '80' | |
- option proto 'tcp' | |
- option target 'ACCEPT' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option dest_port '443' | |
- option proto 'tcp' | |
- option target 'ACCEPT' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option dest_port '22' | |
- option proto 'tcp' | |
- option target 'ACCEPT' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option dest_port '698' | |
- option proto 'udp' | |
- option target 'ACCEPT' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option dest_port '17990' | |
- option proto 'tcp' | |
- option target 'ACCEPT' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option dest_port '53' | |
- option proto 'icmp' | |
- | |
-config rule | |
- option src_port '68' | |
- option leasetime '30m' | |
- option target 'ACCEPT' | |
- option src 'freifunk' | |
- option dest_port '80' | |
- option proto 'tcp' | |
- | |
-config rule | |
- option proto 'tcp' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option dest_port '443' | |
- | |
-config forwarding | |
- option dest 'freifunk' | |
- option src 'lan' | |
- | |
-config forwarding | |
- option dest 'freifunk' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option dest_port '22' | |
- option proto 'tcp' | |
- option target 'ACCEPT' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option dest_port '698' | |
- option proto 'udp' | |
- option target 'ACCEPT' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option dest_port '17990' | |
- option proto 'tcp' | |
- option target 'ACCEPT' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option proto 'udp' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option dest_port '53' | |
- | |
-config rule | |
- option src_port '68' | |
- option leasetime '30m' | |
- option proto 'udp' | |
- option target 'ACCEPT' | |
- option dest_port '67' | |
- option src 'freifunk' | |
- | |
-config rule | |
- option proto 'tcp' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option dest_port '8082' | |
- | |
diff -uNr base-100/etc/config/freifunk 030-with-cb20306/etc/config/freifunk | |
--- base-100/etc/config/freifunk 2018-03-05 20:57:30.000000000 +0100 | |
+++ 030-with-cb20306/etc/config/freifunk 2018-03-11 09:30:36.000000000 +0100 | |
@@ -15,85 +15,9 @@ | |
option splash_prefix '27' | |
option name 'berlin' | |
-config fw_zone 'zone_freifunk' | |
- option name 'freifunk' | |
- option input 'REJECT' | |
- option forward 'REJECT' | |
- option output 'ACCEPT' | |
- | |
-config fw_rule 'fficmp' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option proto 'icmp' | |
- | |
-config fw_rule 'ffhttp' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option proto 'tcp' | |
- option dest_port '80' | |
- | |
-config fw_rule 'ffhttps' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option proto 'tcp' | |
- option dest_port '443' | |
- | |
-config fw_rule 'ffssh' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option proto 'tcp' | |
- option dest_port '22' | |
- | |
-config fw_rule 'ffolsr' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option proto 'udp' | |
- option dest_port '698' | |
- | |
-config fw_rule 'ffwprobe' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option proto 'tcp' | |
- option dest_port '17990' | |
- | |
-config fw_rule 'ffdns' | |
- option dest_port '53' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option proto 'udp' | |
- | |
-config fw_rule 'ffdhcp' | |
- option src_port '68' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option dest_port '67' | |
- option proto 'udp' | |
- option leasetime '30m' | |
- | |
-config fw_rule 'ffsplash' | |
- option dest_port '8082' | |
- option src 'freifunk' | |
- option target 'ACCEPT' | |
- option proto 'tcp' | |
- | |
-config fw_forwarding 'lanfffwd' | |
- option src 'lan' | |
- option dest 'freifunk' | |
- | |
-config fw_forwarding 'ffwanfwd' | |
- option src 'freifunk' | |
- option dest 'wan' | |
- | |
-config fw_forwarding 'fffwd' | |
- option src 'freifunk' | |
- option dest 'freifunk' | |
- | |
-config include 'freifunk' | |
- option path '/etc/firewall.freifunk' | |
- | |
config defaults 'system' | |
option zonename 'Europe/Berlin' | |
- option timezone 'CET-1CEST,M3.5.0,M10.5.0/3' | |
+ option timezone 'CET-1CES' | |
config defaults 'wifi_device' | |
option diversity '1' | |
@@ -101,33 +25,6 @@ | |
option country 'DE' | |
option channel '13' | |
-config defaults 'wifi_iface' | |
- option mode 'adhoc' | |
- option encryption 'none' | |
- option bssid '12:CA:FF:EE:BA:BE' | |
- option mcast_rate '6000' | |
- | |
-config defaults 'madwifi_wifi_iface' | |
- option bgscan '0' | |
- option sw_merge '1' | |
- option probereq '1' | |
- option mcast_rate '5500' | |
- | |
-config defaults 'interface' | |
- option netmask '255.255.0.0' | |
- option dns '8.8.8.8 212.204.49.83 141.1.1.1' | |
- | |
-config defaults 'alias' | |
- option netmask '255.255.255.0' | |
- | |
-config defaults 'dhcp' | |
- option start '2' | |
- option force '1' | |
- option leasetime '5m' | |
- | |
-config defaults 'olsr_interfacedefaults' | |
- option Ip4Broadcast '255.255.255.255' | |
- | |
config defaults 'wifi_device_5' | |
option diversity '1' | |
option disabled '0' | |
diff -uNr base-100/etc/config/system 030-with-cb20306/etc/config/system | |
--- base-100/etc/config/system 2018-03-05 20:57:30.000000000 +0100 | |
+++ 030-with-cb20306/etc/config/system 2018-03-11 09:30:34.000000000 +0100 | |
@@ -1,25 +1,23 @@ | |
config system | |
- option ttylogin '0' | |
- option log_size '64' | |
- option urandom_seed '0' | |
option cronloglevel '10' | |
option zonename 'Europe/Berlin' | |
option timezone 'CET-1CEST,M3.5.0,M10.5.0/3' | |
option hostname 'upgrade-test' | |
option latitude '52.437035778778380' | |
option longitude '13.546416157942321' | |
+ option version '1.0.1' | |
config timeserver 'ntp' | |
+ list server '0.openwrt.pool.ntp.org' | |
+ list server '1.openwrt.pool.ntp.org' | |
+ list server '2.openwrt.pool.ntp.org' | |
+ list server '3.openwrt.pool.ntp.org' | |
option enabled '1' | |
option enable_server '0' | |
- list server '0.lede.pool.ntp.org' | |
- list server '1.lede.pool.ntp.org' | |
- list server '2.lede.pool.ntp.org' | |
- list server '3.lede.pool.ntp.org' | |
diff -uNr base-100/etc/config/ucitrack 030-with-cb20306/etc/config/ucitrack | |
--- base-100/etc/config/ucitrack 2018-03-05 20:53:56.000000000 +0100 | |
+++ 030-with-cb20306/etc/config/ucitrack 2018-03-11 09:30:38.000000000 +0100 | |
@@ -54,6 +54,9 @@ | |
config tinyproxy | |
option init 'tinyproxy' | |
+config freifunk-policyrouting | |
+ list exec '/etc/init.d/freifunk-policyrouting restart' | |
+ | |
config olsrd | |
option init 'olsrd' | |
diff -uNr base-100/etc/config/uhttpd 030-with-cb20306/etc/config/uhttpd | |
--- base-100/etc/config/uhttpd 2018-03-05 20:53:56.000000000 +0100 | |
+++ 030-with-cb20306/etc/config/uhttpd 2017-04-10 12:05:44.000000000 +0200 | |
@@ -18,11 +18,11 @@ | |
option rfc1918_filter '0' | |
option redirect_https '0' | |
-config cert 'defaults' | |
+config cert 'px5g' | |
option days '730' | |
- option bits '2048' | |
+ option bits '1024' | |
option country 'ZZ' | |
option state 'Somewhere' | |
- option location 'Unknown' | |
- option commonname 'Freifunk Berlin' | |
+ option location 'Uknown' | |
+ option commonname 'Freifunk Berlin - 28a2fc30' | |
diff -uNr base-100/etc/config/wireless 030-with-cb20306/etc/config/wireless | |
--- base-100/etc/config/wireless 2018-03-05 20:58:12.000000000 +0100 | |
+++ 030-with-cb20306/etc/config/wireless 2017-04-10 12:09:30.000000000 +0200 | |
@@ -12,7 +12,6 @@ | |
config wifi-iface | |
option network 'wireless0' | |
- option encryption 'none' | |
option device 'radio0' | |
option bssid 'D2:CA:FF:EE:BA:BE' | |
option ssid 'intern-ch13.freifunk.net' | |
diff -uNr base-100/etc/hosts 030-with-cb20306/etc/hosts | |
--- base-100/etc/hosts 2018-02-20 10:50:38.000000000 +0100 | |
+++ 030-with-cb20306/etc/hosts 2017-04-10 11:21:10.000000000 +0200 | |
@@ -1,5 +1 @@ | |
127.0.0.1 localhost | |
- | |
-::1 localhost ip6-localhost ip6-loopback | |
-ff02::1 ip6-allnodes | |
-ff02::2 ip6-allrouters | |
diff -uNr base-100/etc/inittab 030-with-cb20306/etc/inittab | |
--- base-100/etc/inittab 2018-02-20 10:50:38.000000000 +0100 | |
+++ 030-with-cb20306/etc/inittab 2017-04-10 11:21:10.000000000 +0200 | |
@@ -1,3 +1,3 @@ | |
::sysinit:/etc/init.d/rcS S boot | |
::shutdown:/etc/init.d/rcS K shutdown | |
-::askconsole:/usr/libexec/login.sh | |
+::askconsole:/bin/ash --login | |
diff -uNr base-100/etc/iproute2/rt_tables 030-with-cb20306/etc/iproute2/rt_tables | |
--- base-100/etc/iproute2/rt_tables 2018-03-05 20:54:00.000000000 +0100 | |
+++ 030-with-cb20306/etc/iproute2/rt_tables 2018-03-11 09:30:36.000000000 +0100 | |
@@ -1,7 +1,6 @@ | |
# | |
# reserved values | |
# | |
-128 prelocal | |
255 local | |
254 main | |
253 default | |
diff -uNr base-100/etc/profile 030-with-cb20306/etc/profile | |
--- base-100/etc/profile 2018-02-20 10:50:38.000000000 +0100 | |
+++ 030-with-cb20306/etc/profile 2017-04-10 11:21:10.000000000 +0200 | |
@@ -1,29 +1,18 @@ | |
#!/bin/sh | |
-[ -e /tmp/.failsafe ] && export FAILSAFE=1 | |
- | |
[ -f /etc/banner ] && cat /etc/banner | |
-[ -n "$FAILSAFE" ] && cat /etc/banner.failsafe | |
- | |
-fgrep -sq '/ overlay ro,' /proc/mounts && { | |
- echo 'Your JFFS2-partition seems full and overlayfs is mounted read-only.' | |
- echo 'Please try to remove files from /overlay/upper/... and reboot!' | |
-} | |
+[ -e /tmp/.failsafe ] && cat /etc/banner.failsafe | |
-export PATH="/usr/sbin:/usr/bin:/sbin:/bin" | |
+export PATH=/usr/sbin:/usr/bin:/sbin:/bin | |
export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6) | |
export HOME=${HOME:-/root} | |
export PS1='\u@\h:\w\$ ' | |
-[ "$TERM" = "xterm" ] && export PS1='\[\e]0;\u@\h: \w\a\]'$PS1 | |
- | |
[ -x /bin/more ] || alias more=less | |
[ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi | |
-alias ll='ls -alF --color=auto' | |
- | |
[ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc | |
-[ -x /usr/bin/arp -o -x /sbin/arp ] || arp() { cat /proc/net/arp; } | |
+[ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; } | |
[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; } | |
[ -n "$FAILSAFE" ] || { | |
@@ -32,24 +21,3 @@ | |
done | |
unset FILE | |
} | |
- | |
-if ( grep -qs '^root::' /etc/shadow && \ | |
- [ -z "$FAILSAFE" ] ) | |
-then | |
-cat << EOF | |
-=== WARNING! ===================================== | |
-There is no root password defined on this device! | |
-Use the "passwd" command to set up a new password | |
-in order to prevent unauthorized SSH logins. | |
--------------------------------------------------- | |
-EOF | |
-fi | |
- | |
-service() { | |
- [ -f "/etc/init.d/$1" ] || { | |
- echo "service "'"'"$1"'"'" not found, the following services are available:" | |
- ls "/etc/init.d" | |
- return 1 | |
- } | |
- /etc/init.d/$@ | |
-} | |
diff -uNr base-100/etc/protocols 030-with-cb20306/etc/protocols | |
--- base-100/etc/protocols 1970-01-01 01:00:00.000000000 +0100 | |
+++ 030-with-cb20306/etc/protocols 2017-04-10 11:21:10.000000000 +0200 | |
@@ -0,0 +1,56 @@ | |
+# Internet (IP) protocols | |
+# | |
+# Updated from http://www.iana.org/assignments/protocol-numbers and other | |
+# sources. | |
+# New protocols will be added on request if they have been officially | |
+# assigned by IANA and are not historical. | |
+# If you need a huge list of used numbers please install the nmap package. | |
+ | |
+ip 0 IP # internet protocol, pseudo protocol number | |
+#hopopt 0 HOPOPT # IPv6 Hop-by-Hop Option [RFC1883] | |
+icmp 1 ICMP # internet control message protocol | |
+igmp 2 IGMP # Internet Group Management | |
+ggp 3 GGP # gateway-gateway protocol | |
+ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'') | |
+st 5 ST # ST datagram mode | |
+tcp 6 TCP # transmission control protocol | |
+egp 8 EGP # exterior gateway protocol | |
+igp 9 IGP # any private interior gateway (Cisco) | |
+pup 12 PUP # PARC universal packet protocol | |
+udp 17 UDP # user datagram protocol | |
+hmp 20 HMP # host monitoring protocol | |
+xns-idp 22 XNS-IDP # Xerox NS IDP | |
+rdp 27 RDP # "reliable datagram" protocol | |
+iso-tp4 29 ISO-TP4 # ISO Transport Protocol class 4 [RFC905] | |
+xtp 36 XTP # Xpress Transfer Protocol | |
+ddp 37 DDP # Datagram Delivery Protocol | |
+idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport | |
+ipv6 41 IPv6 # Internet Protocol, version 6 | |
+ipv6-route 43 IPv6-Route # Routing Header for IPv6 | |
+ipv6-frag 44 IPv6-Frag # Fragment Header for IPv6 | |
+idrp 45 IDRP # Inter-Domain Routing Protocol | |
+rsvp 46 RSVP # Reservation Protocol | |
+gre 47 GRE # General Routing Encapsulation | |
+esp 50 IPSEC-ESP # Encap Security Payload [RFC2046] | |
+ah 51 IPSEC-AH # Authentication Header [RFC2402] | |
+skip 57 SKIP # SKIP | |
+ipv6-icmp 58 IPv6-ICMP # ICMP for IPv6 | |
+ipv6-nonxt 59 IPv6-NoNxt # No Next Header for IPv6 | |
+ipv6-opts 60 IPv6-Opts # Destination Options for IPv6 | |
+rspf 73 RSPF CPHB # Radio Shortest Path First (officially CPHB) | |
+vmtp 81 VMTP # Versatile Message Transport | |
+eigrp 88 EIGRP # Enhanced Interior Routing Protocol (Cisco) | |
+ospf 89 OSPFIGP # Open Shortest Path First IGP | |
+ax.25 93 AX.25 # AX.25 frames | |
+ipip 94 IPIP # IP-within-IP Encapsulation Protocol | |
+etherip 97 ETHERIP # Ethernet-within-IP Encapsulation [RFC3378] | |
+encap 98 ENCAP # Yet Another IP encapsulation [RFC1241] | |
+# 99 # any private encryption scheme | |
+pim 103 PIM # Protocol Independent Multicast | |
+ipcomp 108 IPCOMP # IP Payload Compression Protocol | |
+vrrp 112 VRRP # Virtual Router Redundancy Protocol | |
+l2tp 115 L2TP # Layer Two Tunneling Protocol [RFC2661] | |
+isis 124 ISIS # IS-IS over IPv4 | |
+sctp 132 SCTP # Stream Control Transmission Protocol | |
+fc 133 FC # Fibre Channel | |
+ | |
diff -uNr base-100/etc/services 030-with-cb20306/etc/services | |
--- base-100/etc/services 1970-01-01 01:00:00.000000000 +0100 | |
+++ 030-with-cb20306/etc/services 2017-04-10 11:21:08.000000000 +0200 | |
@@ -0,0 +1,171 @@ | |
+echo 7/tcp | |
+echo 7/udp | |
+discard 9/tcp | |
+discard 9/udp | |
+daytime 13/tcp | |
+daytime 13/udp | |
+netstat 15/tcp | |
+chargen 19/tcp | |
+chargen 19/udp | |
+ftp-data 20/tcp | |
+ftp 21/tcp | |
+ssh 22/tcp | |
+ssh 22/udp | |
+telnet 23/tcp | |
+smtp 25/tcp | |
+time 37/tcp | |
+time 37/udp | |
+whois 43/tcp | |
+domain 53/tcp | |
+domain 53/udp | |
+bootps 67/tcp | |
+bootps 67/udp | |
+bootpc 68/tcp | |
+bootpc 68/udp | |
+tftp 69/udp | |
+finger 79/tcp | |
+www 80/tcp http | |
+kerberos 88/tcp kerberos5 krb5 kerberos-sec | |
+kerberos 88/udp kerberos5 krb5 kerberos-sec | |
+pop3 110/tcp | |
+pop3 110/udp | |
+sunrpc 111/tcp | |
+sunrpc 111/udp | |
+auth 113/tcp ident | |
+sftp 115/tcp | |
+nntp 119/tcp | |
+ntp 123/tcp | |
+ntp 123/udp | |
+netbios-ns 137/tcp | |
+netbios-ns 137/udp | |
+netbios-dgm 138/tcp | |
+netbios-dgm 138/udp | |
+netbios-ssn 139/tcp | |
+netbios-ssn 139/udp | |
+imap2 143/tcp imap | |
+imap2 143/udp imap | |
+snmp 161/tcp | |
+snmp 161/udp | |
+snmp-trap 162/tcp snmptrap | |
+snmp-trap 162/udp snmptrap | |
+xdmcp 177/tcp | |
+xdmcp 177/udp | |
+bgp 179/tcp | |
+bgp 179/udp | |
+imap3 220/tcp | |
+imap3 220/udp | |
+ldap 389/tcp | |
+ldap 389/udp | |
+https 443/tcp | |
+https 443/udp | |
+microsoft-ds 445/tcp | |
+microsoft-ds 445/udp | |
+isakmp 500/tcp | |
+isakmp 500/udp | |
+rtsp 554/tcp | |
+rtsp 554/udp | |
+ipp 631/tcp | |
+ipp 631/udp | |
+syslog 514/udp | |
+printer 515/tcp spooler | |
+dhcpv6-client 546/tcp | |
+dhcpv6-client 546/udp | |
+dhcpv6-server 547/tcp | |
+dhcpv6-server 547/udp | |
+afpovertcp 548/tcp | |
+afpovertcp 548/udp | |
+nntps 563/tcp snntp | |
+nntps 563/udp snntp | |
+ldaps 636/tcp | |
+ldaps 636/udp | |
+tinc 655/tcp | |
+tinc 655/udp | |
+rsync 873/tcp | |
+rsync 873/udp | |
+ftps-data 989/tcp | |
+ftps 990/tcp | |
+imaps 993/tcp | |
+imaps 993/udp | |
+ircs 994/tcp | |
+ircs 994/udp | |
+pop3s 995/tcp | |
+pop3s 995/udp | |
+socks 1080/tcp | |
+socks 1080/udp | |
+openvpn 1194/tcp | |
+openvpn 1194/udp | |
+l2f 1701/tcp l2tp | |
+l2f 1701/udp l2tp | |
+radius 1812/tcp | |
+radius 1812/udp | |
+radius-acct 1813/tcp radacct | |
+radius-acct 1813/udp radacct | |
+nfs 2049/tcp | |
+nfs 2049/udp | |
+dict 2628/tcp | |
+dict 2628/udp | |
+gpsd 2947/tcp | |
+gpsd 2947/udp | |
+icpv2 3130/tcp icp | |
+icpv2 3130/udp icp | |
+mysql 3306/tcp | |
+mysql 3306/udp | |
+nut 3493/tcp | |
+nut 3493/udp | |
+distcc 3632/tcp | |
+distcc 3632/udp | |
+daap 3689/tcp | |
+daap 3689/udp | |
+svn 3690/tcp subversion | |
+svn 3690/udp subversion | |
+epmd 4369/tcp | |
+epmd 4369/udp | |
+iax 4569/tcp | |
+iax 4569/udp | |
+mtn 4691/tcp | |
+mtn 4691/udp | |
+munin 4949/tcp | |
+sip 5060/tcp | |
+sip 5060/udp | |
+sip-tls 5061/tcp | |
+sip-tls 5061/udp | |
+xmpp-client 5222/tcp jabber-client | |
+xmpp-client 5222/udp jabber-client | |
+xmpp-server 5269/tcp jabber-server | |
+xmpp-server 5269/udp jabber-server | |
+mdns 5353/tcp | |
+mdns 5353/udp | |
+postgresql 5432/tcp postgres | |
+postgresql 5432/udp postgres | |
+x11 6000/tcp | |
+x11 6000/udp | |
+mysql-proxy 6446/tcp | |
+mysql-proxy 6446/udp | |
+bacula-dir 9101/tcp | |
+bacula-dir 9101/udp | |
+bacula-fd 9102/tcp | |
+bacula-fd 9102/udp | |
+bacula-sd 9103/tcp | |
+bacula-sd 9103/udp | |
+nbd 10809/tcp | |
+zabbix-agent 10050/tcp | |
+zabbix-agent 10050/udp | |
+zabbix-trapper 10051/tcp | |
+zabbix-trapper 10051/udp | |
+hkp 11371/tcp | |
+hkp 11371/udp | |
+ssmtp 465/tcp smtps | |
+spamd 783/tcp | |
+zebrasrv 2600/tcp | |
+zebra 2601/tcp | |
+ripd 2602/tcp | |
+ripngd 2603/tcp | |
+ospfd 2604/tcp | |
+bgpd 2605/tcp | |
+ospf6d 2606/tcp | |
+ospfapi 2607/tcp | |
+isisd 2608/tcp | |
+sane-port 6566/tcp sane saned | |
+ircd 6667/tcp | |
+git 9418/tcp | |
+ | |
diff -uNr base-100/etc/sysctl.conf 030-with-cb20306/etc/sysctl.conf | |
--- base-100/etc/sysctl.conf 2018-02-20 10:50:38.000000000 +0100 | |
+++ 030-with-cb20306/etc/sysctl.conf 2017-04-10 11:21:10.000000000 +0200 | |
@@ -1,12 +1,11 @@ | |
kernel.panic=3 | |
-kernel.core_pattern=/tmp/%e.%t.%p.%s.core | |
- | |
net.ipv4.conf.default.arp_ignore=1 | |
net.ipv4.conf.all.arp_ignore=1 | |
net.ipv4.ip_forward=1 | |
net.ipv4.icmp_echo_ignore_broadcasts=1 | |
net.ipv4.icmp_ignore_bogus_error_responses=1 | |
net.ipv4.igmp_max_memberships=100 | |
+net.ipv4.tcp_ecn=0 | |
net.ipv4.tcp_fin_timeout=30 | |
net.ipv4.tcp_keepalive_time=120 | |
net.ipv4.tcp_syncookies=1 |
Author
SvenRoederer
commented
Apr 17, 2018
•
- Revision 1 is the original full diff
- Revision 2 is reduced by diffs caused by reordered parameters, different autogenerated keys, addresses and profile-files
- Revision 3 is a fix for Rev2 (network.interface.ffuplink)
- Revision 4 addresses the network.rule.olsr_*_ffvpn_ipv4 by freifunk-berlin/firmware-packages@6665da3
- Revision 5 addresses the changed boardnames of the GLinet-products used in Kathleen0.2.0 and 0.3.0 (freifunk-berlin/firmware-packages@3614ad8)
How can we divide it into handy pieces?
I can see some simple transformations and a whole bunch of changes, which are hard to me to imagine how to do that automatically and safe.
Would single ideas help?
- Revision 6: fix /etc/config/defaults (openvpn) freifunk-berlin/firmware-packages@31a592d
- Revision 7: "/etc/hosts", "/etc/inittab", "/etc/profile" replaced by upstream version freifunk-berlin/firmware-packages@61bfe9b
- Revision 8: "/etc/iproute2/rt_tables" add table 128 - also freifunk-berlin/firmware-packages@61bfe9b
- Revision 9: "/etc/sysctl.conf" remove "tcp_ecn=0" as it's the kernel-default or at least not required; "kernel.core" add upstream parameter - also freifunk-berlin/firmware-packages@61bfe9b
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment