From 4467982c2b135233b0eb8bf5ae217d6220310ef5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Apr 2014 16:48:20 -0400 Subject: propellor spin --- config-joey.hs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 254e810a..698bb3c3 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -19,6 +19,7 @@ import qualified Propellor.Property.Docker as Docker import qualified Propellor.Property.Git as Git import qualified Propellor.Property.Apache as Apache import qualified Propellor.Property.Postfix as Postfix +import qualified Propellor.Property.Service as Service import qualified Propellor.Property.SiteSpecific.GitHome as GitHome import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuilder import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites @@ -73,6 +74,11 @@ hosts = -- (o) ` & Docker.garbageCollected `period` Daily & Apt.installed ["git-annex", "mtr", "screen"] + + -- Nothing is using https on clam, so listen on that port + -- for ssh, for traveling on bad networks. + & "/etc/ssh/sshd_config" `File.containsLine` "Port 443" + `onChange` Service.restarted "ssh" -- Orca is the main git-annex build box. , standardSystem "orca.kitenet.net" Unstable "amd64" -- cgit v1.3-2-g0d8e From 2bc9a2a7379f80595f5b8f3dc5475f64d5537cfc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 1 May 2014 10:48:33 -0300 Subject: add module Mains for picky versions of ghc --- config-joey.hs | 1 + propellor.hs | 2 ++ 2 files changed, 3 insertions(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index 698bb3c3..a35f77bd 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -1,4 +1,5 @@ -- This is the live config file used by propellor's author. +module Main where import Propellor import Propellor.CmdLine diff --git a/propellor.hs b/propellor.hs index c7727751..2478450f 100644 --- a/propellor.hs +++ b/propellor.hs @@ -12,6 +12,8 @@ -- The source is either copied from /usr/src/propellor, or is cloned from -- git over the network. +module Main where + import Utility.UserInfo import Utility.Monad import Utility.Process -- cgit v1.3-2-g0d8e