[PATCH v3 3/5] configurehood: Only provide hood file from GW/KeyXchange via WWW

[Fabian Bläse]

Die v2 von diesem Patch(set) hatte ich total übersehen.
Sollte seit der v2 keine Randfälle mehr haben..

Reviewed-by: Fabian Bläse <fabian at blaese.de>

> On 8. Jul 2018, at 19:57, Adrian Schmutzler <freifunk at adrianschmutzler.de> wrote:
> 
> This will copy to hoodfilewww every 5 minutes!
> 
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> 
> ---
> 
> Changes in v2:
> - Remove additional auth file
> - Copy directly after hood file retrieval
> 
> Changes in v3:
> Rebase
> ---
> src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> index b6ba3e3..de722f0 100755
> --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> @@ -74,7 +74,7 @@ if [ -s "$hoodfilelocal" ]; then
> else
> 	# if we have Internet, we download the Hoodfile from the keyxchangev2
> 	if hasInternet ; then
> -		getKeyserverHoodfile "$hoodfiletmp"
> +		getKeyserverHoodfile "$hoodfiletmp" && cp "$hoodfiletmp" "$hoodfilewww"
> 
> 		#if no Internet, we connect to the hidden AP and download the file from another Node in range
> 	else
> @@ -95,7 +95,7 @@ else
> 			getEthernetHoodfile "$hoodfiletmp" || getWirelessHoodfile "$hoodfiletmp"
> 		else
> 			echo "We have a Gateway in Range, we load the keyxchangev2data from fe80::1"
> -			getGatewayHoodfile "$hoodfiletmp"
> +			getGatewayHoodfile "$hoodfiletmp" && cp "$hoodfiletmp" "$hoodfilewww"
> 		fi
> 	fi
> fi
> @@ -187,7 +187,6 @@ if [ -s "$hoodfiletmp" ]; then
> 		# copy the file to webroot so that other mesh routers can download it;
> 		# copy only after all other steps so IF can be reentered if something goes wrong
> 		cp "$hoodfiletmp" "$hoodfileref"
> -		cp "$hoodfiletmp" "$hoodfilewww"
> 
> 		# This is a workaround to enable alfred on devices which do not see a configap during initial setup
> 		/etc/init.d/alfred restart
> --
> 2.7.4
> 

-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 833 bytes
Beschreibung: Message signed with OpenPGP
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20180708/8be0dc72/attachment.sig>