summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 22:08:29 -0400
committerJoey Hess2016-03-07 22:08:29 -0400
commit558a599160bba5c393d00c4a5a24aa2ff1ae28f4 (patch)
tree29333b16ad95ecd39cdc7fd8bb5d1df87999c2a2
parente7c7adc0c4cdc838eada045334b038c7f01dcc56 (diff)
update docs for FreeBSD, now merged
closes https://github.com/joeyh/propellor/pull/11
-rw-r--r--doc/FreeBSD.mdwn22
-rw-r--r--doc/Linux.mdwn9
-rw-r--r--doc/README.mdwn2
-rw-r--r--doc/forum/FreeBSD_Port/comment_1_ecb4253fd0cf4060cf8706c0f633a225._comment8
4 files changed, 23 insertions, 18 deletions
diff --git a/doc/FreeBSD.mdwn b/doc/FreeBSD.mdwn
index 1cac527e..5e5a6d4e 100644
--- a/doc/FreeBSD.mdwn
+++ b/doc/FreeBSD.mdwn
@@ -1,19 +1,5 @@
-# FreeBSD Support for Propellor
+Propellor is in the early stages of supporting FreeBSD. It should basically
+work, and there are some modules with FreeBSD-specific properties.
-This branch is to add FreeBSD support to Propellor. The first steps
-will focus around package management with pkg-ng.
-
-# Bootstrapping
-
-The current Bootstrap process is very apt-centric, so current efforts
-are focusing on passing the System information down into Bootstrap.
-
-Affected functions are:
-
-* `installGitCommand`, which has to install pkg itself, then install
- git. The `ASSUME_ALWAYS_YES` environment variable must be set so pkg
- will just do its thing.
-
-* `depsCommand`, which installs as many Haskell dependencies from the
- system package manager. We also install gmake, but I'm not sure
- where this is used yet.
+However, many other properties assume they're being run on a
+Debian Linux system, and need additional porting to support FreeBSD.
diff --git a/doc/Linux.mdwn b/doc/Linux.mdwn
new file mode 100644
index 00000000..0434d69d
--- /dev/null
+++ b/doc/Linux.mdwn
@@ -0,0 +1,9 @@
+Propellor was written to manage Linux systems.
+It supports Debian and Debian-derived distributions.
+
+Support for other distributions should not be too hard to add.
+Indeed, Propellor has been ported to [[FreeBSD]] now!
+See [[forum/Supported_OS]] for porting tips.
+
+Note that you can run Propellor on a OSX laptop and have it manage Linux
+systems.
diff --git a/doc/README.mdwn b/doc/README.mdwn
index 62085fdb..b17f8575 100644
--- a/doc/README.mdwn
+++ b/doc/README.mdwn
@@ -2,6 +2,8 @@
configuration management system using Haskell and Git.
Each system has a list of properties, which Propellor ensures
are satisfied.
+[Linux](http://propellor.branchable.com/Linux/) and
+[FreeBSD](http://propellor.branchable.com/FreeBSD/) are supported.
Propellor is configured via a git repository, which typically lives
in `~/.propellor/` on your development machine. Propellor clones the
diff --git a/doc/forum/FreeBSD_Port/comment_1_ecb4253fd0cf4060cf8706c0f633a225._comment b/doc/forum/FreeBSD_Port/comment_1_ecb4253fd0cf4060cf8706c0f633a225._comment
new file mode 100644
index 00000000..a09d5cc2
--- /dev/null
+++ b/doc/forum/FreeBSD_Port/comment_1_ecb4253fd0cf4060cf8706c0f633a225._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-03-08T02:01:27Z"
+ content="""
+This has now been merged into propellor master, after quite a lot more
+improvements. See the [[FreeBSD]] page.
+"""]]