summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--joeyconfig.hs12
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
2 files changed, 13 insertions, 1 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 20c53ff7..86b99f80 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -27,6 +27,7 @@ import qualified Propellor.Property.Locale as Locale
import qualified Propellor.Property.Grub as Grub
import qualified Propellor.Property.Borg as Borg
import qualified Propellor.Property.Gpg as Gpg
+import qualified Propellor.Property.OpenId as OpenId
import qualified Propellor.Property.Systemd as Systemd
import qualified Propellor.Property.Journald as Journald
import qualified Propellor.Property.Fail2Ban as Fail2Ban
@@ -309,6 +310,7 @@ kite = host "kite.kitenet.net" $ props
& JoeySites.kgbServer
& Systemd.nspawned ancientKitenet
+ & Systemd.nspawned openidProvider
& alias "podcatcher.kitenet.net"
& JoeySites.podcatcher
@@ -487,6 +489,16 @@ oldusenetShellBox = Systemd.debContainer "oldusenet-shellbox" $ props
& alias "shell.olduse.net"
& JoeySites.oldUseNetShellBox
+-- My own openid provider. Uses php, so containerized for security
+-- and administrative sanity.
+openidProvider :: Systemd.Container
+openidProvider = Systemd.debContainer "openid-provider" $ props
+ & standardContainer (Stable "stretch")
+ & alias hn
+ & OpenId.providerFor [User "joey", User "liw"] hn (Just (Port 8086))
+ where
+ hn = "openid.kitenet.net"
+
type Motd = [String]
-- This is my standard system setup.
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index d623ec89..9460e787 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -806,7 +806,7 @@ legacyWebSites = propertyList "legacy web sites" $ props
, "RewriteRule /~anna/.* http://waldeneffect\\.org/ [R]"
, "RewriteRule /~anna/.* http://waldeneffect\\.org/ [R]"
, "RewriteRule /~anna http://waldeneffect\\.org/ [R]"
- , "RewriteRule /simpleid/ http://openid.kitenet.net:8081/simpleid/"
+ , "RewriteRule /simpleid/ http://openid.kitenet.net:8086/simpleid/"
, "# Even the kite home page is not here any more!"
, "RewriteRule ^/$ http://www.kitenet.net/ [R]"
, "RewriteRule ^/index.html http://www.kitenet.net/ [R]"