diff options
| -rw-r--r-- | retiolum/hosts/cloudkrebs | 18 | ||||
| -rwxr-xr-x | util/bin/make-realwallpaper | 87 |
2 files changed, 52 insertions, 53 deletions
diff --git a/retiolum/hosts/cloudkrebs b/retiolum/hosts/cloudkrebs index 9ad4f0ac..a6783d0b 100644 --- a/retiolum/hosts/cloudkrebs +++ b/retiolum/hosts/cloudkrebs @@ -1,12 +1,12 @@ -Address = 162.219.5.151 -Subnet = 10.243.113.76 -Subnet = 42:20c5:9d2e:7d95:c5d6:26f6:b4b9:09a5 +Address = 167.88.34.190 +Subnet = 10.243.206.102 +Subnet = 42:941e:2816:35f4:5c5e:206b:3f0b:f762 -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA2MYdxEO0uV2LmNP/8XKinT7Pn9pO7T7aEtAaaoF9q2/qXV0JWeBS -UTKvK7qUpHr+x6a1DK7Ya4EJUjmdDqm5eb63YtiqWAQo3AXYV2yr7LoyrhbfxzEv -2swnHx+9x1os8eAnwZqouQBTa+TL6E9gIXtfSfjvBnQlqhmUqfXV71NpKFDxInwq -rKb6W37RudM5Mq1+cV49m1a9Z+kNqHwakryhIDDXo4cXNMpPaNuxOdY+VY6txm1d -naz3djp/LIYy//Mkg0fRogQDTL2cErpPLpPa4A/TPvHDZtQVzF28fg01s9SvNlA2 -oFP2VHnZgKJHI0h3D+LM9f1NIhaeGz3NpwIDAQAB +MIIBCgKCAQEAoXp4UXctvHQRiJps4CzURNBsZE8mC8emtXK6pjfq73Pg4R94ayx4 ++JtgEFY+VZeNIKHlaAqfNm8+RfHS7AFgMkiA4WBK2PI8Vpj64wUHz+EcySIInIdx +9J00KRUYA9w8pC8qxjZlxsFlDb4i/kzk1Qt4izV++itzICRolHcuHCeWN3ceok1O +gckSSi+zSyGiukRlIHqFkHRCJzt2LV06BV+8ARvLBsF/N9imfVxlfNpEcJCjwgFY +E5kcr7HpywYA3myphmvrGTPV/xy0m1tfNsWNMWXdk75K2Pl8h3h8b2ViHgcWjmNY +jDeTVvaoGgFRzfu+3cA1TiHwDcQKKZodBQIDAQAB -----END RSA PUBLIC KEY----- diff --git a/util/bin/make-realwallpaper b/util/bin/make-realwallpaper index 837bd378..5e05d0ee 100755 --- a/util/bin/make-realwallpaper +++ b/util/bin/make-realwallpaper @@ -86,7 +86,7 @@ main() { ln $normal $final done - make_gcloud_cloudmask + # make_gcloud_cloudmask map=daymap-final.png night_map=nightmap-final.png @@ -117,33 +117,32 @@ satellite_file=$satellite_file shade=15 EOF - # create xplanet output gcloud version - cat >xplanet-gcloud.config <<EOF -[earth] -"Earth" -map=$map -night_map=$night_map -cloud_map=$gcloud_map -cloud_threshold=10 -shade=15 -EOF - - # create xplanet output gcloud-satellite version - cat >xplanet-gcloud-sat.config <<EOF -[earth] -"Earth" -map=$map -night_map=$night_map -cloud_map=$gcloud_map -cloud_threshold=10 -satellite_file=$satellite_file -shade=15 -EOF +# # create xplanet output gcloud version +# cat >xplanet-gcloud.config <<EOF +#[earth] +#"Earth" +#map=$map +#night_map=$night_map +#cloud_map=$gcloud_map +#cloud_threshold=10 +#shade=15 +#EOF +# +# # create xplanet output gcloud-satellite version +# cat >xplanet-gcloud-sat.config <<EOF +#[earth] +#"Earth" +#map=$map +#night_map=$night_map +#cloud_map=$gcloud_map +#cloud_threshold=10 +#satellite_file=$satellite_file +#shade=15 +#EOF cat >krebs.sat <<EOF 25544 "ISS" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10 37820 "T1" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10 -39258 "CYG" Image=none trail={orbit,-2,2,1} color=grey thickness=1 fontsize=10 EOF cat >krebs.mar <<EOF @@ -159,15 +158,15 @@ EOF --output xplanet-sat-output.png --projection merc \ -config xplanet-sat.config - # rebuild every time to update shadow gcloud - xplanet --num_times 1 --geometry $xplanet_out_size \ - --output xplanet-gcloud-output.png --projection merc \ - -config xplanet-gcloud.config - - # rebuild everytime satellite gcloud version - xplanet --num_times 1 --geometry $xplanet_out_size \ - --output xplanet-gcloud-sat-output.png --projection merc \ - -config xplanet-gcloud-sat.config +# # rebuild every time to update shadow gcloud +# xplanet --num_times 1 --geometry $xplanet_out_size \ +# --output xplanet-gcloud-output.png --projection merc \ +# -config xplanet-gcloud.config +# +# # rebuild everytime satellite gcloud version +# xplanet --num_times 1 --geometry $xplanet_out_size \ +# --output xplanet-gcloud-sat-output.png --projection merc \ +# -config xplanet-gcloud-sat.config # trim xplanet output if needs_rebuild realwallpaper.png xplanet-output.png; then @@ -181,17 +180,17 @@ EOF realwallpaper-sat.png fi - # trim xplanet output - if needs_rebuild realwallpaper-gcloud.png xplanet-gcloud-output.png; then - convert xplanet-gcloud-output.png -crop $out_geometry \ - realwallpaper-gcloud.png - fi - - # trim xplanet-sat output - if needs_rebuild realwallpaper-gcloud-sat.png xplanet-gcloud-sat-output.png; then - convert xplanet-gcloud-sat-output.png -crop $out_geometry \ - realwallpaper-gcloud-sat.png - fi +# # trim xplanet output +# if needs_rebuild realwallpaper-gcloud.png xplanet-gcloud-output.png; then +# convert xplanet-gcloud-output.png -crop $out_geometry \ +# realwallpaper-gcloud.png +# fi +# +# # trim xplanet-sat output +# if needs_rebuild realwallpaper-gcloud-sat.png xplanet-gcloud-sat-output.png; then +# convert xplanet-gcloud-sat-output.png -crop $out_geometry \ +# realwallpaper-gcloud-sat.png +# fi } # generate clouds from google maps |