summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-03-30 02:44:40 -0400
committerJoey Hess2014-03-30 02:44:40 -0400
commit49231c74a1449c7f8c4c07fdafdf4e0b2d51400b (patch)
tree503a2ed3a3dbeeb32db39777ff0601c3873e319a
parentc4afc9c90f9016b3ecfa96193c531c73ccbdeae4 (diff)
foo
-rw-r--r--Makefile4
-rw-r--r--README13
2 files changed, 10 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f0e91106..fcee0734 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
build: dist/setup-config
+ git pull
+ if [ $$(whoami) = root ] then apt-get install ghc cabal-install libghc-missingh-dev libansi-terminal-dev libghc-ifelse-dev libghc-unix-compat-dev libghc-hslogger-dev; fi
cabal build
$(MAKE) tags
-dist/setup-config:
+dist/setup-config: propellor.cabal
cabal configure
clean:
diff --git a/README b/README
index 66b2f3d0..36cbef99 100644
--- a/README
+++ b/README
@@ -1,15 +1,16 @@
This is a work in progress configuration management system using Haskell
and Git.
-The design is intentionally very bare bones: A git repository holds the
-source to a program that ensures that the system meets a set of properties,
-taking action as necessary when a property is not yet met.
+The design is intentionally very bare bones: Propellor enures that
+the system it's run in satisfies a list of properties, taking action as
+necessary when a property is not yet met.
-Once set up, a system will have this git repository cloned to it, and
-the program will be built and run periodically by a cron job. Or something
+Propellor lives in a git repository, and so to set it up it's cloned
+to a system, and "make" can be used to pull down any new changes,
+and compile and run propellor. This can be done by a cron job. Or something
can ssh in and run it.
-For bootstrapping, the program compiles to a single binary file,
+For bootstrapping, propellor compiles to a single binary file,
which can be transferred to a host and run.
Properties are defined using Haskell. There is no special language as used