diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-01-22 13:40:20 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-01-22 13:40:20 -0600 |
| commit | 2a0f4b824a104c97f3464d68d853720bb8bb06c2 (patch) | |
| tree | 4e71560b8add111ffccd601b19aacbb868c82d36 /doc | |
| parent | e8be69a17541d1973ebb446cfe5af308e39ac68b (diff) | |
| parent | 7e88c5454e7cce16874b69e402779af9412fd055 (diff) | |
| download | bcfg2-2a0f4b824a104c97f3464d68d853720bb8bb06c2.tar.gz bcfg2-2a0f4b824a104c97f3464d68d853720bb8bb06c2.tar.bz2 bcfg2-2a0f4b824a104c97f3464d68d853720bb8bb06c2.zip | |
Merge branch 'master' of https://github.com/jdigilio/bcfg2
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/appendix/guides/ubuntu.txt | 16 | ||||
| -rw-r--r-- | doc/server/plugins/generators/rules.txt | 56 |
2 files changed, 46 insertions, 26 deletions
diff --git a/doc/appendix/guides/ubuntu.txt b/doc/appendix/guides/ubuntu.txt index 54aa62cce..8ffda7166 100644 --- a/doc/appendix/guides/ubuntu.txt +++ b/doc/appendix/guides/ubuntu.txt @@ -477,3 +477,19 @@ Dynamic (web) reports ===================== See installation instructions at :ref:`server-reports-install` + +Upstart +======= + +Upstart services are defined like this: + +.. code-block:: xml + + <Service name="cron" status="on" type="upstart"/> + +Some Upstart services require additional parameters, like network-interface and bridge-network-interface: + +.. code-block:: xml + + <Service name="network-interface" status="on" type="upstart" parameters="INTERFACE=eth0"/> + <Service name="bridge-network-interface" status="on" type="upstart" parameters="INTERFACE=br0"/>
\ No newline at end of file diff --git a/doc/server/plugins/generators/rules.txt b/doc/server/plugins/generators/rules.txt index 511cfbb47..fe60a24fd 100644 --- a/doc/server/plugins/generators/rules.txt +++ b/doc/server/plugins/generators/rules.txt @@ -116,32 +116,36 @@ See :ref:`client-tools-actions` Service Tag ----------- -+----------+--------------------------+---------------------------------------+ -| Name | Description | Values | -+==========+==========================+=======================================+ -| mode | Per Service Mode (New in | (manual|default|supervised|custom) | -| | 1.0) | | -+----------+--------------------------+---------------------------------------+ -| name | Service Name | String | -+----------+--------------------------+---------------------------------------+ -| status | Should the service be | (on|off) | -| | on or off (default: | | -| | off). | | -+----------+--------------------------+---------------------------------------+ -| target | Service command for | String | -| | restart, modified | | -| | targets require | | -| | mode="custom" | | -| | (default: restart) | | -+----------+--------------------------+---------------------------------------+ -| type | Driver to use on the | (chkconfig|deb|rc-update|smf|upstart) | -| | client to manage this | | -| | service. | | -+----------+--------------------------+---------------------------------------+ -| sequence | Order for service | integer | -| | startup (debian services | | -| | only) | | -+----------+--------------------------+---------------------------------------+ ++------------+--------------------------+---------------------------------------+ +| Name | Description | Values | ++============+==========================+=======================================+ +| mode | Per Service Mode (New in | (manual|default|supervised|custom) | +| | 1.0) | | ++------------+--------------------------+---------------------------------------+ +| name | Service Name | String | ++------------+--------------------------+---------------------------------------+ +| status | Should the service be | (on|off) | +| | on or off (default: | | +| | off). | | ++------------+--------------------------+---------------------------------------+ +| target | Service command for | String | +| | restart, modified | | +| | targets require | | +| | mode="custom" | | +| | (default: restart) | | ++------------+--------------------------+---------------------------------------+ +| type | Driver to use on the | (chkconfig|deb|rc-update|smf|upstart) | +| | client to manage this | | +| | service. | | ++------------+--------------------------+---------------------------------------+ +| sequence | Order for service | integer | +| | startup (debian services | | +| | only) | | ++------------+--------------------------+---------------------------------------+ +| parameters | Pass parameters to | String | +| | service (Upstart | | +| | services only) | | ++------------+--------------------------+---------------------------------------+ Service mode descriptions ^^^^^^^^^^^^^^^^^^^^^^^^^ |