63f2c6d Merge branch 'multirepo_docs_improvements' of git://github.com/namore/pkg into namore-multirepo_docs_improvements — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge branch 'multirepo_docs_improvements' of git://github.com/namore/pkg into namore-multirepo_docs_improvements

Matthew Seaman committed 12 years ago

commit 63f2c6dc7e1d931a9db7f49ae1752977624e6f16
parent 96e1382

2 files changed +38 -8

modified README.md

@@ -305,6 +305,8 @@ packages from the remote repository, you would use the `pkg install` command:

 <a name="multirepos"></a>
 ### Working with multiple remote repositories
 **Note**: With pkg-1.1 the setup changes significantly. See *pkg.conf(5)* for more information.
 pkgng is also able to work with multiple remote repositories. In the previous section
 we are using only a single remote repository, which is defined by the _PACKAGESITE_ option.

modified pkg/pkg.conf.5

@@ -101,12 +101,6 @@ Specifies the directory to use for storing the package

 database files.
 The default value for this option is
 .Pa /var/db/pkg
 .It Cm PKG_MULTIREPOS: boolean
 This option when enabled will tell
 .Xr pkg 1
 to work in multiple repositories mode.
 For example repositories
 definitions, please have a look at the sample configuration file.
 .It Cm PLIST_KEYWORDS_DIR: string
 < To be added >
 .It Cm PORTSDIR: string

@@ -172,9 +166,43 @@ in JSON.

 .It Cm SSH_RESTRICT_DIR: string
 Directory where the ssh subsystem will be restricted to
 .El
 .Sh MULTIPLE REPOSITORIES
 To use multiple repositories, specify the primary repository as shown above.
 Further repositores can be configured using repository files.
 .Pp
 Repository files reside in
 .Pa /usr/local/etc/pkg/repos/ .
 .Pp
 The filename does not matter,
 .Pa /usr/local/etc/pkg/repos/myrepo.conf
 could be used as an example.
 .Pp
 A repository file is in YAML format and has the following form (see
 above for the description of most options):
 .Bl -tag -width ".Cm myrepo:"
 .It Cm myrepo:
 .Bl -tag -width ".Cm MIRROR_TYPE: string"
 .It Cm URL: string
 PACKAGESITE for this repository only.
 .It Cm ENABLED: boolean
 The repository will be used only if this option is enabled. (default: YES)
 .It Cm MIRROR_TYPE: string
 MIRROR_TYPE for this repository only. (default: NONE)
 .It Cm PUBKEY: string
 PUBKEY for this repository only. (default: NONE)
 .El
 .El
 .Pp
 Note that
 .Fa myrepo
 could be any string.
 However no two repositories may share the same name.
 .Pp
 It is possible to specify more than one repository per file.
 .Sh ENVIRONMENT
 An environment variable with the same name as the option in the configuration
 file always overrides the value of an option set in the file.
 An environment variable with the same name as the option in the
 configuration file always overrides the value of an option set in the
 file.
 .Sh SEE ALSO
 .Xr fetch 3 ,
 .Xr pkg 8 ,