diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-08-26 12:37:42 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-08-26 12:37:42 -0500 |
| commit | 172c31a18cd6283523903dbd0da4ffe120914ae8 (patch) | |
| tree | d81c3d5ff1db92813e1603ee1e2579154db86c6e /doc | |
| parent | 8738109a1491af68f753d851938b79b467291e39 (diff) | |
| parent | d5b3c70dccd23f687c8194f6ea1807092370e586 (diff) | |
| download | bcfg2-172c31a18cd6283523903dbd0da4ffe120914ae8.tar.gz bcfg2-172c31a18cd6283523903dbd0da4ffe120914ae8.tar.bz2 bcfg2-172c31a18cd6283523903dbd0da4ffe120914ae8.zip | |
Merge branch 'sysv-http' of https://github.com/nathanolla/bcfg2 into maint
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/client/tools.txt | 23 | ||||
| -rw-r--r-- | doc/development/compat.txt | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/doc/client/tools.txt b/doc/client/tools.txt index 1dbb33b1a..ce8732454 100644 --- a/doc/client/tools.txt +++ b/doc/client/tools.txt @@ -154,7 +154,28 @@ Systemd service support. SYSV ---- -Handles System V Packaging format that is available on Solaris. +Handles `System V Packaging <http://docs.oracle.com/cd/E19683-01/806-7008/index.html>`_ format that is available on Solaris. + +.. note:: + + If the Packages specified in the PackageList are datastream format packages distributed via HTTP, you must specify a simplename attribute. Such packages will be downloaded and installed from a local path. + + datastream format over HTTP: + + .. code-block:: xml + + <PackageList url='http://install/packages' type='sysv' priority='0'> + <Package name='SCbcfg2' version='1.3.4' simplename='bcfg-1.3.4-1' /> + </PackageList> + + File system format over NFS or local path: + + .. code-block:: xml + + <PackageList url='/mnt/install/packages' type='sysv' priority='0'> + <Package name='SCbcfg2' version='1.3.4' /> + </PackageList> + Upstart ------- diff --git a/doc/development/compat.txt b/doc/development/compat.txt index f90274ce5..8700c46d3 100644 --- a/doc/development/compat.txt +++ b/doc/development/compat.txt @@ -60,6 +60,8 @@ behavior (e.g., :func:`input`) do not cause unexpected side-effects. +---------------------------------+--------------------------------------------------+---------------------------------------------------------+ | urlparse | :func:`urlparse.urlparse` | :func:`urllib.parse.urlparse` | +---------------------------------+--------------------------------------------------+---------------------------------------------------------+ +| urlretrieve | :func:`urllib.urlretrieve` | :func:`urllib.request.urlretrieve` | ++---------------------------------+--------------------------------------------------+---------------------------------------------------------+ | HTTPBasicAuthHandler | :class:`urllib2.HTTPBasicAuthHandler` | :class:`urllib.request.HTTPBasicAuthHandler` | +---------------------------------+--------------------------------------------------+---------------------------------------------------------+ | HTTPPasswordMgrWithDefaultRealm | :class:`urllib2.HTTPPasswordMgrWithDefaultRealm` | :class:`urllib.request.HTTPPasswordMgrWithDefaultRealm` | |