X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=oktopus.mk;h=ad05f751484bad654e18320d5befb30417d599c8;hb=e046806d2551905cb045c03015cc33ad182a5c79;hp=ed0088b15c25699e1215c06ffc1be26b18a66747;hpb=29678818188e331a79eca50348243a19af4ec9d2;p=blast

diff --git a/oktopus.mk b/oktopus.mk
index ed0088b..ad05f75 100644
--- a/oktopus.mk
+++ b/oktopus.mk
@@ -13,7 +13,7 @@ packages=python-tk,python-spidev,python-pygame,python-bluez,python-rpi.gpio,cker
 release=stretch
 
 ## Comma separated list of config modules from modules/ directory
-modules=approx,remo2hbo,autoresize
+modules=approx,remo2hbo,autoresize,display_ws5inch
 
 ## Hostname for the generated machine
 hostname=oktopus
@@ -37,8 +37,10 @@ rootkey=oktopus
 #wifi=berlin.freifunk.net
 # wifi=MyWiFi
 # wifipass=P4ssW0rD
-wifi="funky Kater"
-wifipass="katerholzig"
+# wifi=funky Kater
+# wifipass=katerholzig
+wifi=Layer9
+wifipass=AllePriesterSaufenTequilaNachDerPredigt
 
 ## Timezone as offered by Debians tzdata selection
 timezone=Europe/Berlin
@@ -59,18 +61,19 @@ webui=http://localhost/
 ## can be choosen to install packages from
 ## See modules/approx.mk if you need more flexibility
 # approx=http://localhost:9000/debian
+approxhost := localhost:9999
 
 .PHONY: _oktopus_maskjournal
 _config: _oktopus_maskjournal ${CFGROOT}/opt/demo.py
 
-img_mount/opt/demo.py: oktopus_raspberry/ ${CFGROOT}
+img_mount/opt/demo.py: oktopus_raspberry/ ${CFGROOT} _copy
 	cp "$</demo3.py" "$@"
 	cp "$</demo4.py" "$@"
 
 oktopus_raspberry/:
-	git clone https://git.tools.f4.htw-berlin.de/sliublin/oktopus_raspberry.git "$@"
+	[ -d oktopus_raspberry ] || git clone https://git.tools.f4.htw-berlin.de/sliublin/oktopus_raspberry.git "$@"
 
-_oktopus_maskjournal: ${CFGROOT}
-	mkdir -p "$${CFGROOT}/etc/systemd/system/"
+_oktopus_maskjournal: ${CFGROOT} _copy
+	# mkdir -p "$${CFGROOT}/etc/systemd/system/"
 	ln -sf /dev/null "$${CFGROOT}/etc/systemd/system/systemd-journald.service"
 	ln -sf /dev/null "$${CFGROOT}/etc/systemd/system/systemd-timesyncd.service"