Forráskód Böngészése

Projekte 8A35,8D37,9A52 mit vpn Zugang zugefügt
Anpassungen, kleinere Korrekturen

Reinhard Russinger 6 éve
szülő
commit
10fa818c56

+ 15 - 0
board/PSG/iot2000/post-build.sh

@@ -1,2 +1,17 @@
 #!/bin/sh -e
 cp ../PSG/board/PSG/iot2000/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
+echo "===========================================>"
+echo "============== $TARGET_DIR ==============>"
+echo "===========================================>"
+
+#---Dienste auf manuell stellen
+SERVICE=S97mysqld
+NSERVICE=M97mysqld
+if [ -f $TARGET_DIR/etc/init.d/$SERVICE ]
+then
+	if [ -f $TARGET_DIR/etc/init.d/$NSERVICE ]
+	then
+        	rm $TARGET_DIR/etc/init.d/$NSERVICE
+	fi
+        mv $TARGET_DIR/etc/init.d/$SERVICE $TARGET_DIR/etc/init.d/$NSERVICE
+fi

+ 4 - 4
board/PSG/iot2000/rootfs_overlay/etc/dnsmasq.conf

@@ -3,10 +3,10 @@ interface=usb0
 interface=wlan0
 
 no-dhcp-interface=eth0
-dhcp-range=eth1,192.168.0.201,192.168.0.239,1h
+dhcp-range=eth1,192.168.100.201,192.168.100.239,1h
 dhcp-option=eth1,1,255.255.255.0
-dhcp-option=eth1,3,192.168.0.200
-dhcp-option=eth1,6,192.168.0.200
+dhcp-option=eth1,3,192.168.100.200
+dhcp-option=eth1,6,192.168.100.200
 
 dhcp-range=wlan0,192.168.10.201,192.168.10.239,1h
 dhcp-option=wlan0,1,255.255.255.0
@@ -20,7 +20,7 @@ dhcp-option=usb0,6,192.168.7.2
 
 listen-address=127.0.0.1
 listen-address=192.168.7.2
-listen-address=192.168.0.200
+listen-address=192.168.100.200
 listen-address=192.168.10.200
 
 

+ 2 - 2
board/PSG/iot2000/rootfs_overlay/etc/network/interfaces

@@ -8,9 +8,9 @@ iface lo inet loopback
 iface eth0 inet dhcp
 
 iface eth1 inet static
-       address 192.168.0.200
+       address 192.168.100.200
        netmask 255.255.255.0
-       broadcast 192.168.0.255
+       broadcast 192.168.100.255
 
 iface usb0 inet static
 	address 192.168.7.2

+ 0 - 1
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet

@@ -1 +0,0 @@
-psgnet_P_8A35

+ 16 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8D37/hosts/P_8D37

@@ -0,0 +1,16 @@
+#--- automatisch erstellt
+Subnet = 10.222.0.202/32
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAtv8zgkC2UR6STdhcJnc2X+AWapY41fAgdEkRNe0lXiAe49as/lP3
+hZnndBDwSj02Eyqtw8v/Hdd8O+C5e4LzmymDgOzyNGqGhpzwkwkd3VpNIjcrwo5Q
+cbla+KgJyj8fL3iXY0vtz4xnw2hTYs0fBWTpOCswsMsK3w9ahpPb+iwWoUcuQEfR
+TGFLy10BmNyIf5sDegiAMabjjZQowlcoUkhKMqeVV7kQffBG9/1nWERH5t+As2P/
+tj5P2h8qe7nkmbnD4UlEDEgOhEKCgtEFb0nvBQ/19alDqW6OTAS7Mfqu4pVGMTAM
+rVfUDEN/ZdpzFyhqsN5gQem1F+tOyQ0FCT4Ka4uWdtmREZu2NcdmnkpgeEdVEOqn
++B8Sct9DL/g8GWlEJGYnzm6CdjDaKSpuCK1TJ5pHRg5VCXiurIZl7IjhES6N1u0D
+TSckHWoMjX5+f6R86oDINgmF9IzpF+XaXij/bWBXeLNRERqVX9FJ6ubx0Wz+p1t3
+RJheMi7mhRgwn/vQvnuVeO7T24tStgDokdome/rGfgJK3JcgTGFEF0N+THb8c9FO
+wBcxBlkivjBLF8rO2nafeJ0KTjD4LqUDQDJ/3lZf2Sx5HhSWRC8UMicQVfyfdpgx
++J2G6DBKf3Jfk2VLL4hCJ/PHu3tLf2c/LeshgMYppfER3y/l0blNYeECAwEAAQ==
+-----END RSA PUBLIC KEY-----

+ 16 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8D37/hosts/psgnet

@@ -0,0 +1,16 @@
+Address = gogs.psg-bgh.de 443
+Subnet = 10.222.0.1/32
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEA0C7f+XIVcIJ0hHPkLXQ2HSAsqRBGuZBND3opPEI9IlR13HemSpIT
+N0ME4guB94I6RyUyTu/JhHzwUUFNnD/3OtEu3fPmmyjPUk0+nhsvoaqN9JBT/U9/
+ujgziNR5N1l6m/51FDU0dryOLASgnyWEPr7ozesrUcZxV12iAdspa2zsDMoLBhbC
+/ro2pqp0cSNzsuWhV2qEXiJEoTIU71t6t0cvWpXzwGSqUPxxJuQ74I0Xx7q/6eFm
+jy44x7L5OX/EIqanSUoQ+pFCit7Vdb1CNU+s6OWnxA9dxxWdVfCkB9CrPbto4o8t
+R6qbA2Y8F5hOAdeEYD/rpqAs/WcvNxiMtK0Zkr1sJIQv9ujY6dwCv9LShsEtCJkk
+F4eYuak2kGStWBQmpbCBqAleglt9pI7azzBi4Dt/17O4qQZJLjJuaT6TOc2cx8+s
+D24x3mUwpsYhUNx19/e5IYlJZSQhJNHUa212LT+7dmjwkAoUGZ2ZUIjWUpOBAPXJ
+K2FAunOOPd5HImIKz3ST6zHTy9L0xnGSK4K52//bfsOnpo4pGtu5ERWqU+66gjyq
+MJLBKcajRP9JZIyFvHgJYBE1LFo4e7hs4SHf3hon8TptcuVcL5ANQm8ZXyQH5riL
+Sxx0a9uhkBFpLcvy1VIWgtyYyFDe+4PyXAP+CPvkJc69PuIibN9Vk+ECAwEAAQ==
+-----END RSA PUBLIC KEY-----

+ 52 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8D37/rsa_key.priv

@@ -0,0 +1,52 @@
+
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

+ 2 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8D37/tinc-down

@@ -0,0 +1,2 @@
+#!/bin/sh
+ifconfig $INTERFACE down

+ 2 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8D37/tinc-up

@@ -0,0 +1,2 @@
+#!/bin/sh
+ifconfig $INTERFACE 10.222.0.202 netmask 255.255.0.0

+ 7 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_8D37/tinc.conf

@@ -0,0 +1,7 @@
+Name = P_8D37
+PingTimeout = 40
+AddressFamily = ipv4
+Interface = tun5
+Port = 756
+Mode = switch
+ConnectTo = psgnet

+ 16 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_9A52/hosts/P_9A52

@@ -0,0 +1,16 @@
+#--- automatisch erstellt
+Subnet = 10.222.0.201/32
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEA65iRkcyYnzULl47pZDpbu5samx23vOlQZJaDrwm0+gxlOs9hM9U3
+/lBT79hPpRxSi23bR2O93m6OsGsNBBZBittfRgY6/2lhbowCtD6OOBVxfVRrMlr4
+qwQB08J0gmKhrjyvJNl6UsG97WIe55RE17c3yyvzwnBW8EccIg/3SDi191UhSDhq
+9fZMrG9aFJU+7sToSc8Too+fSwbQ8oGm8tvCAlefctdlnHEXIEjuqGKZ0DB55hGT
+e6Faedo4Yw0fMuJoBP8Cn2gIZe14BXh+KytB716Y0HlKxrHs7AKPTrB+GaIKWvBu
+qA63MFL6YSxZtET4nulq8+ZX+1GZDHnRcEWGHPQj5Y5OZIaWrreBI4GQYPk5FPqy
+DI1CZ9aFy1yrDmtJL2ymAtdk0+m5rviUvYLXaB2T7MY4LBsr42GvIj8m2yoW7ZQZ
+8BPWP99ADT4A9wnHxuqxur/LjHeKBa09PDukDxDGNUuq6q3/dOcDUZnvJa3peWbY
+a+ArDOArQLBTYOjoc6jwS3JLGprWQVExAf4bAO/H4Cxpv6BXQM4/G6vPUo31pbK+
+xRjaJMRs9fV+MbwVhj2Lb+IqWP8Jv2bhCHtzoFCfkMByGrc0+mTzAKFjcbJ2owpb
+SIETRfQUJmTqyS6qJXuHONGZ1NjIpclj802MK0NlTz6Lbp9vu6ePGx8CAwEAAQ==
+-----END RSA PUBLIC KEY-----

+ 16 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_9A52/hosts/psgnet

@@ -0,0 +1,16 @@
+Address = gogs.psg-bgh.de 443
+Subnet = 10.222.0.1/32
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEA0C7f+XIVcIJ0hHPkLXQ2HSAsqRBGuZBND3opPEI9IlR13HemSpIT
+N0ME4guB94I6RyUyTu/JhHzwUUFNnD/3OtEu3fPmmyjPUk0+nhsvoaqN9JBT/U9/
+ujgziNR5N1l6m/51FDU0dryOLASgnyWEPr7ozesrUcZxV12iAdspa2zsDMoLBhbC
+/ro2pqp0cSNzsuWhV2qEXiJEoTIU71t6t0cvWpXzwGSqUPxxJuQ74I0Xx7q/6eFm
+jy44x7L5OX/EIqanSUoQ+pFCit7Vdb1CNU+s6OWnxA9dxxWdVfCkB9CrPbto4o8t
+R6qbA2Y8F5hOAdeEYD/rpqAs/WcvNxiMtK0Zkr1sJIQv9ujY6dwCv9LShsEtCJkk
+F4eYuak2kGStWBQmpbCBqAleglt9pI7azzBi4Dt/17O4qQZJLjJuaT6TOc2cx8+s
+D24x3mUwpsYhUNx19/e5IYlJZSQhJNHUa212LT+7dmjwkAoUGZ2ZUIjWUpOBAPXJ
+K2FAunOOPd5HImIKz3ST6zHTy9L0xnGSK4K52//bfsOnpo4pGtu5ERWqU+66gjyq
+MJLBKcajRP9JZIyFvHgJYBE1LFo4e7hs4SHf3hon8TptcuVcL5ANQm8ZXyQH5riL
+Sxx0a9uhkBFpLcvy1VIWgtyYyFDe+4PyXAP+CPvkJc69PuIibN9Vk+ECAwEAAQ==
+-----END RSA PUBLIC KEY-----

+ 52 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_9A52/rsa_key.priv

@@ -0,0 +1,52 @@
+
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

+ 2 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_9A52/tinc-down

@@ -0,0 +1,2 @@
+#!/bin/sh
+ifconfig $INTERFACE down

+ 2 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_9A52/tinc-up

@@ -0,0 +1,2 @@
+#!/bin/sh
+ifconfig $INTERFACE 10.222.0.201 netmask 255.255.0.0

+ 7 - 0
board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_P_9A52/tinc.conf

@@ -0,0 +1,7 @@
+Name = P_9A52
+PingTimeout = 40
+AddressFamily = ipv4
+Interface = tun5
+Port = 756
+Mode = switch
+ConnectTo = psgnet

+ 8 - 8
board/PSG/iot2000/rootfs_overlay/root/delportfwd.sh

@@ -28,11 +28,11 @@ iptables -A FORWARD -p tcp -d $SRCIP --dport $SRCPORT -m state --state NEW,ESTAB
 }
 
 #del_portfwd 80 192.168.0.1 80 192.168.7.2 usb0
-del_portfwd 80 192.168.0.1 80 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
-del_portfwd 80 192.168.0.1 80 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
-del_portfwd 102 192.168.0.1 102 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
-del_portfwd 102 192.168.0.1 102 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
-del_portfwd 443 192.168.0.1 443 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
-del_portfwd 443 192.168.0.1 443 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
-del_portfwd 5900 192.168.0.20 5900 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
-del_portfwd 5900 192.168.0.20 5900 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+del_portfwd 80 192.168.100.1 80 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+del_portfwd 80 192.168.100.1 80 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+del_portfwd 102 192.168.100.1 102 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+del_portfwd 102 192.168.100.1 102 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+del_portfwd 443 192.168.100.1 443 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+del_portfwd 443 192.168.100.1 443 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+del_portfwd 5900 192.168.100.20 5900 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+del_portfwd 5900 192.168.100.20 5900 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5

+ 8 - 8
board/PSG/iot2000/rootfs_overlay/root/portfwd.sh

@@ -28,11 +28,11 @@ iptables -A FORWARD -p tcp -d $SRCIP --dport $SRCPORT -m state --state NEW,ESTAB
 }
 
 #set_portfwd 80 192.168.0.1 80 192.168.7.2 usb0
-set_portfwd 80 192.168.0.1 80 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
-set_portfwd 80 192.168.0.1 80 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
-set_portfwd 102 192.168.0.1 102 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
-set_portfwd 102 192.168.0.1 102 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
-set_portfwd 443 192.168.0.1 443 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
-set_portfwd 443 192.168.0.1 443 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
-set_portfwd 5900 192.168.0.20 5900 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
-set_portfwd 5900 192.168.0.20 5900 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+set_portfwd 80 192.168.100.1 80 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+set_portfwd 80 192.168.100.1 80 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+set_portfwd 102 192.168.100.1 102 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+set_portfwd 102 192.168.100.1 102 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+set_portfwd 443 192.168.100.1 443 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+set_portfwd 443 192.168.100.1 443 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5
+set_portfwd 5900 192.168.100.20 5900 `ifconfig eth0 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` eth0
+set_portfwd 5900 192.168.100.20 5900 `ifconfig tun5 2>/dev/null|awk '/inet addr:/ {print $2}'|sed 's/addr://'` tun5

+ 6 - 5
board/PSG/iot2000/rootfs_overlay/var/psg/Display_GSM.ini

@@ -128,8 +128,9 @@ PROVIDER=Tele Denmark
 GIP=internet
 GNUN= 
 GNPW=
-[SIEMENS]
-SIEMENS_IP=192.168.0.1
-SIEMENS_DBNR=666
-SIEMENS_SLOT=0
-SIEMENS_RACK=0
+
+[SIEMENS]
+SIEMENS_IP=192.168.100.1
+SIEMENS_DBNR=666
+SIEMENS_SLOT=0
+SIEMENS_RACK=0