diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-02 14:42:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-02 14:42:11 -0400 |
| commit | 05b0648e0be87700ecd7ce3a36c966aa96beff7b (patch) | |
| tree | 68634cc5449565caae920d3837de8aa708d518a8 | |
| parent | b9c7cfa7d5d2e8985d05ecee8dd7f6f26fbdfc7d (diff) | |
| parent | e23e5f69e907593786768694f40735397d5085de (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | joeyconfig.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs index 4a3e5c4f..695291d0 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -323,7 +323,7 @@ kite = host "kite.kitenet.net" $ props & alias "ns4.kitenet.net" & myDnsPrimary True "kitenet.net" [ (RelDomain "mouse-onion", CNAME $ AbsDomain "htieo6yu2qtcn2j3.onion") - , (RelDomain "beaver-onion", CNAME $ AbsDomain "") + , (RelDomain "beaver-onion", CNAME $ AbsDomain "tl4xsvaxryjylgxs.onion") ] & myDnsPrimary True "joeyh.name" [] & myDnsPrimary True "ikiwiki.info" [] diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index c6a0c1ad..6e0d6c4e 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -248,7 +248,7 @@ gitServer hosts = propertyList "git.kitenet.net setup" $ props ] `describe` "cgit configured" -- I keep the website used for git.kitenet.net/git.joeyh.name checked into git.. - & Git.cloned (User "root") "/srv/git/joey/git.kitenet.net.git" "/srv/web/git.kitenet.net" Nothing + & Git.cloned (User "joey") "/srv/git/joey/git.kitenet.net.git" "/srv/web/git.kitenet.net" Nothing -- Don't need global apache configuration for cgit. ! Apache.confEnabled "cgit" & website "git.kitenet.net" |