Skip to content

Commit

Permalink
[docs/pkg] add some clarity around custom repo usage in pkg/pkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
froztbyte committed May 1, 2015
1 parent 5188d6c commit f4abf7f
Showing 1 changed file with 23 additions and 5 deletions.
28 changes: 23 additions & 5 deletions salt/states/pkg.py
Expand Up @@ -13,8 +13,6 @@
pkg.installed
A more involved example involves pulling from a custom repository.
Note that the pkgrepo has a require_in clause.
This is necessary and can not be replaced by a require clause in the pkg.
.. code-block:: yaml
Expand All @@ -26,13 +24,33 @@
- file: /etc/apt/sources.list.d/logstash.list
- keyid: 28B04E4A
- keyserver: keyserver.ubuntu.com
- require_in:
- pkg: logstash
logstash:
pkg.installed
'''
- fromrepo: ppa:wolfnet/logstash
Multiple packages can also be installed with the use of the pkgs
state module
.. code-block:: yaml
dotdeb.repo:
pkgrepo.managed:
- humanname: Dotdeb
- name: deb http://packages.dotdeb.org wheezy-php55 all
- dist: wheezy-php55
- file: /etc/apt/sources.list.d/dotbeb.list
- keyid: 89DF5277
- keyserver: keys.gnupg.net
- refresh_db: true
php.packages:
pkg.installed:
- fromrepo: wheezy-php55
- pkgs:
- php5-fpm
- php5-cli
- php5-curl
'''

# Import python libs
from __future__ import absolute_import
Expand Down

0 comments on commit f4abf7f

Please sign in to comment.