propellor spin

config-joey.hs

@@ -48,11 +48,15 @@ hosts =
 		& cname "ancient.kitenet.net"
 		& Docker.docked hosts "ancient-kitenet"
 
-		-- I'd rather this container were on diatom, but
-		-- docker.io is not available in stable.
+		-- I'd rather this were on diatom, but I use features
+		-- not available in stable.
 		& cname "kgb.kitenet.net"
-		& Docker.docked hosts "kgb-server"
-
+		& Apt.serviceInstalledRunning "kgb-bot"
+		& File.hasPrivContent "/etc/kgb-bot/kgb.conf"
+			`onChange` Service.restarted "kgb-bot"
+		& "/etc/default/kgb-bot" `File.containsLine` "BOT_ENABLED=1"
+			`describe` "kgb bot enabled"
+			`onChange` Service.running "kgb-bot"
 		& Docker.garbageCollected `period` Daily
 		& Apt.installed ["git-annex", "mtr", "screen"]
 	
@@ -127,16 +131,6 @@ hosts =
 		& OpenId.providerFor ["joey", "liw"]
 			"openid.kitenet.net:8081"
 
-	-- The kgb irc bot, in a container for security and because I need
-	-- features not in the stable version.
-	, standardContainer "kgb-server" Unstable "amd64"
-		& Docker.publish "9999:9999"
-		& Apt.serviceInstalledRunning "kgb-bot"
-		& File.hasPrivContent "/etc/kgb-bot/kgb.conf"
-		& "/etc/default/kgb-bot" `File.containsLine` "BOT_ENABLED=1"
-			`describe` "kgb bot enabled"
-			`onChange` Service.running "kgb-bot"
-	
 	-- Exhibit: kite's 90's website.
 	, standardContainer "ancient-kitenet" Stable "amd64"
 		& Docker.publish "1994:80"

privdata/clam.kitenet.net.gpg

@@ -1,33 +1,33 @@
 -----BEGIN PGP MESSAGE-----
 Version: GnuPG v1
 
-hQIMA7ODiaEXBlRZARAAl7WWTjAAI3dGASNptUEGmpWD46DAd/0M5uyw1oS+TUJz
-cCTk23jvGeV+eWB+HdVKMsd8EbDYdEbrZxeFrWqlIFq8B+PM1FQ1NEfzigPzcEzR
-0Jf+fQWOtki8RIEV7dkH6M4A9oiGQVA6hvR5ShrBEtLp0YR3xGMTFFZ1CZ2khZOi
-dm47gWXfbyHnFzRsBnnBBHJ8RSez+McTqP8gHc86SzC2Ey/mJv0ShYaW8an5Aetw
-yRhYa5OOGbEbiN+AphZOMyitEFrUGrp1M1kidsBZjgK6bR+9GrMRRZdXzYeyTwUy
-1BTXI62SaTYmBroqa4Qt1U8mTxVF+BovOlIjcnK5kKSb2Nu2fu5jRkMHJ8RIh7kJ
-eaYLi0adffZrBHBApoX4A+wrpuYdPsVkK6afZ1c7ING+GUuZ4rdUzO5lwjTB9VNV
-uGkW+JmCZRA19glyKhGFIom4hkwnAObhxEsuJktOMwokFk4cnzCgb21QWsQZbwdw
-Pbq/qosLDsR5Yym7sfo12B5NM4HTMt7Z4ztLpaHfJpfkzDft7bQHjT4zT1kwm/NT
-NEA5T5bBKy9acT3Y2yOPE0VM87wr2gMFnHqbFiX+QUQWRAUi2q76w0K7dh5TInOs
-hFjMtaz7Iq6vjvQhrHdclHiIuKDF18vndFJAHl8UYVW7XkqgGSSn8runqPcG/t3S
-6QEkVzrFvLBroDnG15BuOtMnqcX72WOlX/hIRSNRuHMbUNiGpGrWGiYXKryWVA91
-BLCXY9a63FWKIhJEA/Si27OEA2kjP7h2lEK/jZt1S0gRVaWqpJu+VACBkZNdLcvc
-kI6f6dz99ALKlqu4EbZcmWw3D+3Gb/AsWUUwdgKkk6ZWSFzglnXQJ72MXaO2dA4B
-axd7peo5qa2Aw2IINrtyDTk9QcxwzuuEbKvl20H/KHT6gGSDey+lYRQac96Iqu9x
-LADL9Z8Lv0pN41tFPpq2H9Fe8Lgo9R/sFlQHOMxYNwqbNMKblRXgsmhg3bpZtFbz
-TLrqkiasqbnuAej3J1HLrOnYPNXx2WHZRPqZyWTBI2Al89AzYcVMwmLE2fHXF7Ko
-cjTPkPv2cvCplbO4uoMVQPHQlQNyXjXR+CJvQ0M+T2jvX69+exx4doPmcp14SM8v
-cZrxUILjim3Z9rAcIn7JVu2acslVpRlv1B0ebaWbUMQDxq+rb+mivzUil1ZpJu24
-1RTlF9Sk9xwUqDoaJBUUbWDHc1wrLFzI7/P5MAzBuuGwE5BKlq0cBjzMZpZqUB4x
-WCkOrz0aOwXkLqEgbHFkHVu9VuLVrDeY59DIKqEK35t9XiY99FASIJstOAly+UpX
-z53lhJKM9oJSrK6FpHu425FpbuJ+kjXWI2bPDRRB2UB8wEP64IzoRlXX34QMltdH
-z5NpteD80V1zWKsTHibaJ3wBEpH3iHz7ujnwV4i63uR59YeHY9JWCZ06/t8QSvvh
-kYZrBTSEyuxO4FBNb36Tee+0gQO+EhAKilFFf5J91Z3rmTL22T0k/2xwNCMfBeTh
-Nvc2jpzM5s5dVDbNnfCVvrj3rvBCYRIBizkjhgJK/l7/FcEYqsUZH4bl1BggOwYY
-pSDXzuunt+nsWZa+xfbmS5aKUgsOdnDlu3I7fv3KKHso//7oJJbg5HefAtmEvIvu
-Us7SlPjMpx82RUQnJWgmzdML9HfnXFGy+9RRxnFZh4rw72SEzDUc4cOV1KKNeuvf
-Q0vxgK8H
-=mBZA
+hQIMA7ODiaEXBlRZAQ/7BbCEPQ1yR8QnUbwDYhPJJluk99TSKik60p7k+CM+a2gK
+03eTj2JmSvFFiMXDfJaMPy+qYWlZukm0pYsw60mO9FqLxfppg9JFY1/G0RdgILgE
+sHm3L0HyGR5HuymO1Ye0WMzF3bhBxhym490nl8XNex0R9baRgfMw7lsFlYZ5NhbW
+Jnrj/iK6gcbPsMuMT3cvjKLIo6Z22ekjlP4c6shEpzSWSl3d0ge5XEN8gj0hEUv7
++2UqUz52IZdK1T1yDIobUTX64VKANzO6TfnoCgy+76pT3wyT6U41kROL8XhvcfaC
+/L9M3aGKxY2H9RPtw52UIlM0o5sUMlgmRUwnpQmb3AO9JYKd3tCeMp2xK8jguA1I
+3p7vDaJi/Z+PMKuBZzjpBym0jv+louqnkeS+d65KIAsY0LTmnnaTyGJMX2PiOouW
+fRdJA+UmSpum3mnE3g0ye7BBeC0WNrBL+RyuvRk4pPWuv3QL+TvbVi/HmagHgFjq
+zKlWzcs3eqp5trNjqa+1eK4C+ZwrYqDLS7kX7jpj4I/qzXP8xinN1kJhL5zMYiLU
+XCDrcPQYj8dTzMrmBY0L2X4nthT100Tl7CahBYl5cTDF7c3FK62sF7kgqy3gysny
+MxwaU5U/OehZAGAiJTuSKnw0Yxl6iEIHTaWOryYSaNJpOHYrQTYkSVoe1aEsg4bS
+6QHko/AxhWyUP9isosGNlfV0AxAe5MfjxRIKbbv/9+UPLkFJ7SPU9P8UD3F/Kttc
+r83L3SWdmrKSTpEF70vj6X0csP9KQdfh2CiZdHPdMsfcW2OOoxlaosvtAr5fu4Dk
+D3Rjc2A+mVSJqTDENONXyFSZqk1cP23yWsA+AH5Cfoznj98rJrm5ZXjX5t0SHBJW
+Yc6PHgzY6/cvHIBmF7QuxEB+3yyv9r3flQQQnfBg28/n5fbmcUoD03+MQRc3BHd9
+E4x1MPeQ5WrHq2wFCy1gL7llrjjSszkH0Vqr3ObNbejowBWbe2EKDio4I14wxWk9
+lrLZXs32nuS+wP5/DqztP3OlKb0HJc8TYas1CiwMFTmW1HmU6nYVkV7ZLs0yGy9a
+/dQCGyasKO26EugQj3rvK/cvGw+QNw6qGwR0+InO929souh8Ugoy12SbHRPNtdHk
+N+EIox9tNYGapa1ZYL0OuPZgvDnaSdtB7U9lbeOOH1zr4RjMVPxzMY4rai3A59Nb
+RQJNvQ23ij9u+Tn7j42/Du18IB8yZe3aZPEgyiDbZmqJADARrmUF+x483piWaGZD
+5G2D7JZfeSoT1BrsSBSxiJQ386z+wrfKzGIMabkswsX/TLoFwRZDwysb/cQiAuZV
+ymLI+lXH6G5ZzYWYi6WRGOjPPQpk6/rC6UlNQyiw5TLuwFtdOQSjsOhZ9M8WW0hz
+ykCMO43kjmSBvNOBz0clgsvxTW4ulRVrU4lZu5orseFGn9YvaJlklDKioWCxSJL0
+6diWBTgdVsIGKCpT5jr7+19BnBaP3JJy0k947S/8e0ACjb5nPiKtSxn1lj4Hnpvf
+Cev1XvzLaWVM9DTntxGBIa82uYcCpWDxffPE7d1DcAaxNhCFqYIAU+aI6V+OqfvT
+HfV5Pu6aN5yteP/K7gqRNmdgSWf1OiH5qCcHvBjeZBs6M5dhFVgIYCmvvyuxjyRu
+T2qdkeoLnZUiiMWeBNbJRhxokZ8tZwC9W85EObT+cGkF+pRfQZt7jISi74syF+3C
+dkTJkUR/IItJ5OGrRegKNNloctGtws3jmo7wGpWt
+=5jg6
 -----END PGP MESSAGE-----