config.sh: Increase scope for new address ranges.

[ssh-ca] / etc / config.sh

diff --git a/etc/config.sh b/etc/config.sh
index b27ec96..7bf8e07 100644 (file)
--- a/etc/config.sh
+++ b/etc/config.sh
@@ -9,8 +9,8 @@
 keytypes="rsa:3072 dsa:1024"
 domain="distorted.org.uk"
 cacomment="ssh-ca@$domain"
-validity="-1d:+2d"
-publish_target="vampire.distorted.org.uk:/var/www/"
+validity="-1d:+2d1h"
+publish_target="vampire.distorted.org.uk:/var/www/ssh-ca/"
 
 ## GnuPG defaults.
 gnupg_key_type=RSA gnupg_key_length=3072
@@ -26,9 +26,12 @@ scope="*.$domain"
 ## IPv4 addresses.
 for i in 144 145 146 147 148 149; do scope=$scope,"62.49.204.$i"; done
 scope=$scope,"62.49.204.15?"
-for i in 198 199; do scope=$scope,"172.29.198.*,172.29.199.*"; done
+for i in 198 199; do scope=$scope,"172.29.$i.*"; done
+scope=$scope,"212.13.198.69,212.13.198.7?"
 
 ## IPv6 addresses.
-scope=$scope,"2001:470:1f09:1b98:*,2001:470:9740:*"
+scope=$scope,"2001:470:1f08:1b98::2,2001:470:1f09:1b98:*"
+scope=$scope,"2001:470:9740:*"
+scope=$scope,"2001:ba8:0:1d9:*,2001:ba8:1d9:*"
 
 ###----- That's all, folks --------------------------------------------------