Remove cherrypy

- I don't need it after all
Refactor and cleanup defaults
2023-03-01 08:17:25 +01:00 · 2023-03-01 08:15:29 +01:00
3 changed files with 12 additions and 7 deletions
--- a/.buildbot/openwrt/build.sh
+++ b/.buildbot/openwrt/build.sh
@ -25,12 +25,9 @@ cat ${pwd}/feeds.conf >> feeds.conf
 ./scripts/feeds install -a

 make defconfig
-echo 'CONFIG_PACKAGE_python3-packages=y' >> .config
-echo 'CONFIG_PACKAGE_python3-packages-list="CherryPy==18.8.0"' >> .config
 # Enable collectd network encryption
 echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config

-make package/python3-packages/compile
 make package/asterisk-chan-quectel/compile
 make package/collectd/compile
 # no signing key
--- a/defaults/49-network
+++ b/defaults/49-network
@ -1,7 +1,9 @@
-[ "$(uci -q get luci.diag.dns)" = "bitmessage.org" ] && exit 0
+VERSION=1

-# make a significant change
-/sbin/uci set luci.diag.dns='bitmessage.org'
+[ "$(uci -q get defaults.version.network)" -ge "$VERSION" ] & exit 
+
+# save version
+/sbin/uci set defaults.version.network="$VERSION"

 # switch LAN to eth1
 /sbin/uci set network.@device[0].ports='eth1'
--- a/defaults/50-dropbear
+++ b/defaults/50-dropbear
@ -1,6 +1,12 @@
 VERSION=1

-[ "$(uci -q get defaults.version.dropbear)" -ge "$VERSION" ] && exit 0
+if [ "$(uci -q get defaults.version.dropbear)" -ge "$VERSION" ]
+then
+	# may leave dropbear off after an upgrade
+	/sbin/service dropbear enable
+	/sbin/service dropbear restart
+	exit 0
+fi

 # save version
 /sbin/uci set defaults.version.dropbear="$VERSION"
Author	SHA1	Message	Date
Peter Šurda	80c1368f2c	Remove cherrypy All checks were successful buildbot/travis_bionic Build done. Details buildbot/multibuild_parent Build done. Details buildbot/job/openwrt Build done. Details - I don't need it after all	2023-03-01 08:17:25 +01:00
Peter Šurda	7b3a05217c	Refactor and cleanup defaults - 49-network is now using versioning - 50-dropbear will make sure dropbear runs even if no version bump happened	2023-03-01 08:15:29 +01:00