diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2012-05-07 13:48:16 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2012-05-07 13:48:16 -0500 |
commit | 16b7ac3cb7f9a49e6b7985059c3d08e984cf468c (patch) | |
tree | 248cb323b81f1713fc803f06dfff5ca43af09d6b | |
parent | 999ec08879afb45f5046b2025820711b86bc52b4 (diff) | |
download | bcfg2-16b7ac3cb7f9a49e6b7985059c3d08e984cf468c.tar.gz bcfg2-16b7ac3cb7f9a49e6b7985059c3d08e984cf468c.tar.bz2 bcfg2-16b7ac3cb7f9a49e6b7985059c3d08e984cf468c.zip |
Options: Change default paranoid setting to 'true'
This makes setting up paranoid mode easier while silencing bcfg2-lint
errors.
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r-- | doc/client/modes.txt | 6 | ||||
-rw-r--r-- | doc/server/info.txt | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Options.py | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/doc/client/modes.txt b/doc/client/modes.txt index 639387859..4cdc54960 100644 --- a/doc/client/modes.txt +++ b/doc/client/modes.txt @@ -33,7 +33,7 @@ How do I use it? ---------------- #. In the Bcfg2 repository, put `paranoid='true'` in the ``info.xml`` - file. + file (this is the default setting). #. On the client, create ``/var/cache/bcfg2`` (or specify an alternate path in the [paranoid] section of ``/etc/bcfg2.conf``). #. On the client, run `bcfg2` with the `-P` option (alternatively, you @@ -71,9 +71,7 @@ accomplish this by adding a global metadata override in your [mdata] paranoid=true -This will override the default value of "paranoid=false" and change it to -"true" which will cause every file you add or update in your Bcfg2 repo -to backup on the client as specified in your client config. +.. note:: This is the default setting. Overall client service mode =========================== diff --git a/doc/server/info.txt b/doc/server/info.txt index 3ee12c54d..d949aab68 100644 --- a/doc/server/info.txt +++ b/doc/server/info.txt @@ -37,7 +37,7 @@ possible fields in an info file are: +------------+-------------------+----------------------------------+---------+ | owner: | Any valid user | Sets owner of the file | root | +------------+-------------------+----------------------------------+---------+ -| paranoid: | true | false | Backup file before replacement? | false | +| paranoid: | true | false | Backup file before replacement? | true | +------------+-------------------+----------------------------------+---------+ | perms: | Numeric file mode | Sets the permissions of the file | 0644 | | | | 'inherit' | (or inherits from the files on | | diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index dc14eaf00..30d3a420f 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -250,7 +250,7 @@ MDATA_PERMS = Option('Default Path permissions', '644', cf=('mdata', 'perms'), odesc='octal permissions') MDATA_PARANOID = Option('Default Path paranoid setting', - 'false', cf=('mdata', 'paranoid'), + 'true', cf=('mdata', 'paranoid'), odesc='Path paranoid setting') MDATA_SENSITIVE = Option('Default Path sensitive setting', 'false', cf=('mdata', 'sensitive'), |