summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile30
-rw-r--r--debian/changelog4
-rw-r--r--doc/haskell_newbie.mdwn2
-rw-r--r--doc/todo/publish_propellor_as_library_to_hackage.mdwn2
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
5 files changed, 18 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index acd70a5f..2cf15b98 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,11 @@ CABAL?=cabal
run: build
./propellor
-dev: build tags
+build: tags propellor.1 dist/setup-config
+ $(CABAL) build
+ ln -sf dist/build/propellor-config/propellor-config propellor
-install: propellor.1
+install:
install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor
install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor
mkdir -p dist/gittmp
@@ -22,9 +24,6 @@ install: propellor.1
&& git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head
rm -rf dist/gittmp
-propellor.1: doc/usage.mdwn doc/mdwn2man
- doc/mdwn2man propellor 1 < doc/usage.mdwn > propellor.1
-
clean:
rm -rf dist Setup tags propellor propellor.1 privdata/local
find -name \*.o -exec rm {} \;
@@ -34,7 +33,14 @@ clean:
# duplicate tags with Propellor.Property. removed from the start, as we
# often import qualified by just the module base name.
tags:
- find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$' | xargs hothasktags | perl -ne 'print; s/Propellor\.Property\.//; print' | sort > tags 2>/dev/null
+ find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$' | xargs hothasktags | perl -ne 'print; s/Propellor\.Property\.//; print' | sort > tags 2>/dev/null || true
+
+dist/setup-config: propellor.cabal
+ @if [ "$(CABAL)" = ./Setup ]; then ghc --make Setup; fi
+ @$(CABAL) configure
+
+propellor.1: doc/usage.mdwn doc/mdwn2man
+ doc/mdwn2man propellor 1 < doc/usage.mdwn > propellor.1
# Upload to hackage.
hackage:
@@ -42,15 +48,3 @@ hackage:
@cabal upload dist/*.tar.gz
.PHONY: tags
-
-# The rules below are only used when bootstrapping new propellor
-# installations and building packages; propellor contains equivilant
-# haskell code that it uses to re-build itself.
-
-build: dist/setup-config
- @if ! $(CABAL) build; then $(CABAL) configure; $(CABAL) build; fi
- @ln -sf dist/build/propellor-config/propellor-config propellor
-
-dist/setup-config: propellor.cabal
- @if [ "$(CABAL)" = ./Setup ]; then ghc --make Setup; fi
- @$(CABAL) configure
diff --git a/debian/changelog b/debian/changelog
index 5dc849dd..f15affbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (2.2.0) UNRELEASED; urgency=medium
+propellor (2.2.0) unstable; urgency=medium
* When running shimmed (eg in a docker container),
improve process name visible in ps.
@@ -7,7 +7,7 @@ propellor (2.2.0) UNRELEASED; urgency=medium
* Propellor now builds itself, and gets its build dependencies installed
when deploying to a new host, without needing the Makefile.
- -- Joey Hess <id@joeyh.name> Mon, 16 Feb 2015 19:00:48 -0400
+ -- Joey Hess <id@joeyh.name> Mon, 09 Mar 2015 12:02:31 -0400
propellor (2.1.0) unstable; urgency=medium
diff --git a/doc/haskell_newbie.mdwn b/doc/haskell_newbie.mdwn
index e62ffea0..39a62f45 100644
--- a/doc/haskell_newbie.mdwn
+++ b/doc/haskell_newbie.mdwn
@@ -8,7 +8,7 @@ configure Propellor!
Let's take a quick tour of the `config.hs` file..
[[!format haskell """
--- | This is the main configuration file for Propellor, and is used to build
+-- This is the main configuration file for Propellor, and is used to build
-- the propellor program.
"""]]
diff --git a/doc/todo/publish_propellor_as_library_to_hackage.mdwn b/doc/todo/publish_propellor_as_library_to_hackage.mdwn
index 24e07497..709ee35b 100644
--- a/doc/todo/publish_propellor_as_library_to_hackage.mdwn
+++ b/doc/todo/publish_propellor_as_library_to_hackage.mdwn
@@ -1,2 +1,4 @@
Currently, AFAIK, one needs to fork propellor repo, add its own configuration and compile propellor binary from all the source tree.
It would be handy and more modular to allow one to have a propellor configuration linked to propellor as a library, hosted on hackage.
+
+> [[done]] --[[Joey]]
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 005f12d1..303a6935 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -322,7 +322,7 @@ twitRss = combineProperties "twitter rss" $ props
-- Work around for expired ssl cert.
pumpRss :: Property NoInfo
pumpRss = Cron.job "pump rss" (Cron.Times "15 * * * *") "joey" "/srv/web/tmp.kitenet.net/"
- "wget https://pump2rss.com/feed/joeyh@identi.ca.atom -O pump.atom --no-check-certificate 2>/dev/null"
+ "wget https://pump2rss.com/feed/joeyh@identi.ca.atom -O pump.atom.new --no-check-certificate 2>/dev/null; sed 's/ & / /g' pump.atom.new > pump.atom"
ircBouncer :: Property HasInfo
ircBouncer = propertyList "IRC bouncer" $ props