Merge pull request #4 from gravyboat/master

Dropped apt include, updated README

README.rst

@@ -1,25 +1,58 @@
+===
 php
-======
-DEPENDENCIES:
-  These formulas are required:
+===
 
-	1) apt
+Formulas to set up and configure php and various php libraries.
 
-ORDERING:
+.. note::
 
-The ordering of the states for php falls into block ranges which are:
+    See the full `Salt Formulas installation and usage instructions
+    <http://docs.saltstack.com/topics/conventions/formulas.html>`_.
 
-	1)  php will use 1-500 for ordering
-	2)  php will reserve 1  -100 as unused
-	3)  php will reserve 101-150 for pre pkg install
-	4)  php will reserve 151-200 for pkg install
-	5)  php will reserve 201-250 for pkg configure
-	6)  php will reserve 251-300 for downloads, git stuff, load data
-	7)  php will reserve 301-400 for unknown purposes
-	8)  php will reserve 401-450 for service restart-reloads
-	9)  php WILL reserve 451-460 for service.running
-	10) php will reserve 461-500 for cmd requiring operational services
+Available states
+================
 
-PILLARS:
+.. contents::
+    :local:
 
-	No Pillars are used in this formula as of yet.
+``php``
+-------
+
+Installs the php package.
+
+``php.apc``
+-----------
+
+Installs the php-apc package.
+
+``php.curl``
+------------
+
+Installs the php5-curl package on Debian, and ensures that curl itself is
+installed for RedHat systems, this is due to the curl libs being provided by
+php-common, which will get installed with the main php package.
+
+``php.fpm``
+-----------
+
+Installs the php-fpm package, starts the service, and enables it.
+
+``php.gd``
+----------
+
+Installs the php-gd package.
+
+``php.mcrypt``
+--------------
+
+Installs the php-mcrypt package.
+
+``php.mysql``
+-------------
+
+Installs the php-mysql package.
+
+``php.pear``
+------------
+
+Installs the php-pear package.

php/apc.sls

@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-apc:
   pkg:
     - installed

php/curl.sls

@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-curl:
   pkg:
     - installed

php/fpm.sls

@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-fpm:
   pkg:
     - installed

php/gd.sls

@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-gd:
   pkg:
     - installed

php/init.sls

@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php:
   pkg:
     - installed

php/mcrypt.sls

@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-mcrypt:
   pkg:
     - installed

php/mysql.sls

@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-mysql:
   pkg:
     - installed

php/pear.sls

@@ -1,8 +1,5 @@
 {% from "php/map.jinja" import php with context %}
 
-include:
-  - apt
-
 php-pear:
   pkg:
     - installed