From a256f6f7b097e250d009a35836d0fb0a3ccd8ef6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 22 Oct 2013 10:49:57 +0200 Subject: added Address to cloudkrebs --- retiolum/hosts/cloudkrebs | 1 + 1 file changed, 1 insertion(+) diff --git a/retiolum/hosts/cloudkrebs b/retiolum/hosts/cloudkrebs index 393c57ca..9ad4f0ac 100644 --- a/retiolum/hosts/cloudkrebs +++ b/retiolum/hosts/cloudkrebs @@ -1,3 +1,4 @@ +Address = 162.219.5.151 Subnet = 10.243.113.76 Subnet = 42:20c5:9d2e:7d95:c5d6:26f6:b4b9:09a5 -- cgit v1.2.3 From 8e3c41c44c8b3698815f0760a80150692f472e66 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 22 Oct 2013 11:49:49 +0200 Subject: added terrapi to retiolum --- retiolum/hosts/terrapi | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 retiolum/hosts/terrapi diff --git a/retiolum/hosts/terrapi b/retiolum/hosts/terrapi new file mode 100644 index 00000000..0e2a2a98 --- /dev/null +++ b/retiolum/hosts/terrapi @@ -0,0 +1,8 @@ +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAtVhVDRBzq0L6JtdVUVEakBzhMP2RjOj7cHZnEUsXzl1TXxuOBhL1 +XOXd3LUuU0jNMMvzxO2VU7K/wM6lX30B6ryqDSfsXKEBM60BiGVzb4Kd+7No76RN +0NsoLygtvtOm1SmvvT1UCsjomoIE4eGdBDsfQzNKt2PUoh/0rTZBHd6qGJuCZQSX +F4IRby4jzYvjOsaSi7GVadvhoyETVxbUAi9VquxOltytA+Ud4CXPb/JW25uVmQQK +RXhoWahWJGJ2WJLGnT1RkTvFQk0zM3XJfPBVItnKCYHuE5HMU/5nnnPvKWiICdsA +1NNU8+kXtK3IJEHwfpRWe/isMj8rROU37wIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 53a654b5fc30e4476e6842ac2fb00719931521f6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 22 Oct 2013 11:55:25 +0200 Subject: added missing SUBNET --- retiolum/hosts/terrapi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/retiolum/hosts/terrapi b/retiolum/hosts/terrapi index 0e2a2a98..cf1748eb 100644 --- a/retiolum/hosts/terrapi +++ b/retiolum/hosts/terrapi @@ -1,3 +1,6 @@ +Subnet = 10.243.30.159 +Subnet = 42:b0bd:090e:2a37:2cb4:3314:58e7:20d1 + -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAtVhVDRBzq0L6JtdVUVEakBzhMP2RjOj7cHZnEUsXzl1TXxuOBhL1 XOXd3LUuU0jNMMvzxO2VU7K/wM6lX30B6ryqDSfsXKEBM60BiGVzb4Kd+7No76RN -- cgit v1.2.3 From a78483aa41a49a1d68e8631b3a84db657edd372d Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 22 Oct 2013 17:28:14 +0200 Subject: retiolum/hosts/cd: initial commit --- retiolum/hosts/cd | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 retiolum/hosts/cd diff --git a/retiolum/hosts/cd b/retiolum/hosts/cd new file mode 100644 index 00000000..3cdd9c0e --- /dev/null +++ b/retiolum/hosts/cd @@ -0,0 +1,12 @@ +Address = 162.219.5.183 +Subnet = 10.243.113.222 +Subnet = 42:4522:25f8:36bb:8ccb:0150:231a:2af3 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAob/6umTaEa8jtU79nYzHa6vyEjFtg3ATh7uTvafmE0b2845Tf2hC +IpSBw//FOnkq2sUvj9IymMnMFBcPq6VZisvXq2B25BJZn16X8PJmkXptCckDoqVj +qRjg/H4q8aryp74dGYDp4ibBKyhN/BP3N5DXH4vkj4A8qHuekJWQD7wWcXj6Jcx5 +otDsj5LZYh0J8LJOXQYxmcadrZoLnkL6s3SkWbgexkJ2l5bhYSVBOEtjKQ8Eq1k3 +Iyao+iyaffUEhcaiwRBXovt77B8RYYY2DjKKVuR4LCxIbB7NKF03tETjensLBw2t +9sV7J5zBGDGbDIOliGBfRABBBlopgaOAsQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 9cfa6323f7e3c3c09bc3d4493dad54f15b4b4a79 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 26 Oct 2013 02:36:55 +0200 Subject: retiolum/hosts/kheurop: initial commit --- retiolum/hosts/kheurop | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/kheurop diff --git a/retiolum/hosts/kheurop b/retiolum/hosts/kheurop new file mode 100644 index 00000000..fe115a94 --- /dev/null +++ b/retiolum/hosts/kheurop @@ -0,0 +1,11 @@ +Subnet = 10.243.78.78 +Subnet = 42:bcd9:7340:9628:9604:7068:5061:4976 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAqIFB0Nk2eSg/K/dJGOEegtezhn5P1RUi1ZgxoZoTR6K4T/tSbD2u +gjPU53mhRN622lLayMMXtWVKdhO4IUu3mKfemA/8/fy7Qu9T51UUS+NXu/4g5X3W +Jg2a37TrnQUrsqNud7QQhPTGF8L0+UT2mHlfRYggtAO1J2pSWtsqDiMAOD+89zvg +Gta8aMdaFPhdkfboaHH6mVJBFOkrjQJE4RiUzwZS24PKh6gRJV4cENdcNRYdVwhv +dOM+SWzPZXDTAVyG6HptvSdfDUKi4hJY4yS+TIf9j7yR0YpUie3CsbN4a9jP2KVt +/NhzZ9nNaEv6O8Nk+7Zu8OaxUPgctEFYfQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From a1af0ff747bf17a4688eb8989b3f98d4d1ba560d Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 26 Oct 2013 04:02:55 +0200 Subject: retiolum/hosts/kheurop: supernode me --- retiolum/hosts/kheurop | 1 + 1 file changed, 1 insertion(+) diff --git a/retiolum/hosts/kheurop b/retiolum/hosts/kheurop index fe115a94..bbe93fe0 100644 --- a/retiolum/hosts/kheurop +++ b/retiolum/hosts/kheurop @@ -1,3 +1,4 @@ +Address = 91.250.101.180 Subnet = 10.243.78.78 Subnet = 42:bcd9:7340:9628:9604:7068:5061:4976 -- cgit v1.2.3 From 8aa8a9082eb362ff8ebe7a86f37d2ce6f155da22 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Oct 2013 17:51:20 +0100 Subject: make-realwallpaper: add usage --- util/bin/make-realwallpaper | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100755 util/bin/make-realwallpaper diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper new file mode 100755 index 00000000..212b1786 --- /dev/null +++ b/util/bin/make-realwallpaper @@ -0,0 +1,46 @@ +#!/bin/sh + +###### USAGE ##### +#run in new directory(will be polluted with images +#just run ./make-realwallpaper + + + +if ! ping -w 10 8.8.8.8 | sed -n '/time=[1-9.]* ms/{p;q}'|grep -q . ; then + echo "we need internet" + exit 1 +fi + +curl -z Nightmap_bare.jpg http://awka.sourceforge.net/Night_le_huge.jpg -o Nightmap_bare.jpg +curl -z Daymap_bare.png http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png -o Daymap_bare.png +curl -z Clouds.jpg http://user.chol.com/~winxplanet/cloud_data/clouds_2048.jpg -o Clouds.jpg + +#resize the Daymap +convert Daymap_bare.png -scale 4000x2000 Daymap.png +#convert Daymap to a snow only alphamap +convert Daymap.png -threshold '95%' Daymap_snowmask.png + +#create a full snowmap in the nightcolor +convert Daymap.png -fill '#0a3b5c' -colorize '100%' Nightmap_fullsnow.png +#get nightlights out of Nightmap_bare +convert Nightmap_bare.jpg -threshold '25%' -transparent '#000000' Nightmap_lightmask.png +#composite Snowmask and Fullsnow to Nightmap_snowlayer +convert Nightmap_fullsnow.png Daymap_snowmask.png -alpha off -compose copy_opacity -composite Nightmap_snowlayer.png +#cut out the lights in Nightmap_lightmask and put them in Nightmap_lightlayer +convert Nightmap_bare.jpg Nightmap_lightmask.png -alpha off -compose copy_opacity -composite Nightmap_lightlayer.png + +#Composite the Nightmap_snowlayer and the Nightmap_lightlayer with the Nightmap +composite Nightmap_lightlayer.png Nightmap_snowlayer.png Nightmap_lightsnowlayer.png +composite Nightmap_lightsnowlayer.png Nightmap_bare.jpg Nightmap.png + +#write the xplanet-configfile +cat > xplanet-config << EOF +[earth] +"Earth" +map=Daymap.png +night_map=Nightmap.png +cloud_map=Clouds.jpg +EOF + +xplanet --num_times 1 --geometry 1366x1200 --output xplanet-output.jpg --projection merc -config xplanet-config +convert xplanet-output.jpg -crop 1366x768+0+160 realwallpaper.png -- cgit v1.2.3 From b53410695a3cba576d7c36292c9e10d9045912bc Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Oct 2013 17:58:43 +0100 Subject: make-realwallpaper removed internetcheck --- util/bin/make-realwallpaper | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 212b1786..f6bf9c2f 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -1,16 +1,10 @@ #!/bin/sh +set -euf ###### USAGE ##### #run in new directory(will be polluted with images #just run ./make-realwallpaper - - -if ! ping -w 10 8.8.8.8 | sed -n '/time=[1-9.]* ms/{p;q}'|grep -q . ; then - echo "we need internet" - exit 1 -fi - curl -z Nightmap_bare.jpg http://awka.sourceforge.net/Night_le_huge.jpg -o Nightmap_bare.jpg curl -z Daymap_bare.png http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png -o Daymap_bare.png curl -z Clouds.jpg http://user.chol.com/~winxplanet/cloud_data/clouds_2048.jpg -o Clouds.jpg -- cgit v1.2.3 From 45ff766f6041493968ddd7a37265fb6baae71dab Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Oct 2013 18:13:54 +0100 Subject: make-realwallpaper less ocean --- util/bin/make-realwallpaper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index f6bf9c2f..22e93b96 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -36,5 +36,5 @@ night_map=Nightmap.png cloud_map=Clouds.jpg EOF -xplanet --num_times 1 --geometry 1366x1200 --output xplanet-output.jpg --projection merc -config xplanet-config -convert xplanet-output.jpg -crop 1366x768+0+160 realwallpaper.png +xplanet --num_times 1 --geometry 1466x1200 --output xplanet-output.jpg --projection merc -config xplanet-config +convert xplanet-output.jpg -crop 1366x768+100+160 realwallpaper.png -- cgit v1.2.3 From 42748584f82c93e674e1c7dc94d90de1f0a364ae Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Oct 2013 18:33:08 +0100 Subject: make-realwallpaper delete files when not image --- util/bin/make-realwallpaper | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 22e93b96..07903ac3 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -5,9 +5,20 @@ set -euf #run in new directory(will be polluted with images #just run ./make-realwallpaper -curl -z Nightmap_bare.jpg http://awka.sourceforge.net/Night_le_huge.jpg -o Nightmap_bare.jpg -curl -z Daymap_bare.png http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png -o Daymap_bare.png -curl -z Clouds.jpg http://user.chol.com/~winxplanet/cloud_data/clouds_2048.jpg -o Clouds.jpg +curl -z Nightmap_bare.jpg http://awka.sourceforge.net/Night_le_huge.jpg -o Nightmap_bare.jpg & +curl -z Daymap_bare.png http://www.nnvl.noaa.gov/images/globaldata/SnowIceCover_Daily.png -o Daymap_bare.png & +curl -z Clouds.jpg http://user.chol.com/~winxplanet/cloud_data/clouds_2048.jpg -o Clouds.jpg & +wait + +if file -ib Nightmap_bare.jpg|grep -q ^image/; then + rm Nightmap_bare.jpg +fi +if file -ib Daymap_bare.png|grep -q ^image/; then + rm Daymap_bare.png +fi +if file -ib Clouds.jpg|grep -q ^image/; then + rm Clouds.jpg +fi #resize the Daymap convert Daymap_bare.png -scale 4000x2000 Daymap.png -- cgit v1.2.3 From c68e5fea30904d22caa40084cac929e976f9cb26 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Oct 2013 18:35:46 +0100 Subject: make-realwallpaper now with exit when no image --- util/bin/make-realwallpaper | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 07903ac3..9fb4da7d 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -12,12 +12,15 @@ wait if file -ib Nightmap_bare.jpg|grep -q ^image/; then rm Nightmap_bare.jpg + exit 1 fi if file -ib Daymap_bare.png|grep -q ^image/; then rm Daymap_bare.png + exit 1 fi if file -ib Clouds.jpg|grep -q ^image/; then rm Clouds.jpg + exit 1 fi #resize the Daymap -- cgit v1.2.3