diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-23 14:50:09 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-23 14:50:09 -0400 |
commit | 46a47b4120b3d892b8149a5e181e4d976ad87f99 (patch) | |
tree | f2697f233fc7f5ad5022864222a5ca87715a651b /examples/TGenshi/etc/dirvish/master.conf | |
parent | e1f99d1d5045e0511db42debb30aa97da2018796 (diff) | |
parent | 3d06f311274d6b942ee89d8cdb13b2ecc99af1b0 (diff) | |
download | bcfg2-46a47b4120b3d892b8149a5e181e4d976ad87f99.tar.gz bcfg2-46a47b4120b3d892b8149a5e181e4d976ad87f99.tar.bz2 bcfg2-46a47b4120b3d892b8149a5e181e4d976ad87f99.zip |
Merge branch '1.4.x'
Conflicts:
debian/bcfg2-server.install
doc/server/plugins/grouping/metadata.txt
src/lib/Bcfg2/Client/Client.py
src/lib/Bcfg2/Client/Tools/Portage.py
src/lib/Bcfg2/Client/Tools/RcUpdate.py
src/lib/Bcfg2/Client/Tools/YUM24.py
src/lib/Bcfg2/Client/Tools/__init__.py
src/lib/Bcfg2/Client/Tools/launchd.py
src/lib/Bcfg2/Options.py
src/lib/Bcfg2/Server/Core.py
src/lib/Bcfg2/Server/Plugin/helpers.py
src/lib/Bcfg2/Server/Plugins/Metadata.py
src/lib/Bcfg2/Server/models.py
src/lib/Bcfg2/Utils.py
src/sbin/bcfg2-info
src/sbin/bcfg2-test
testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
testsuite/Testsrc/test_code_checks.py
Diffstat (limited to 'examples/TGenshi/etc/dirvish/master.conf')
-rw-r--r-- | examples/TGenshi/etc/dirvish/master.conf/template.newtxt | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/examples/TGenshi/etc/dirvish/master.conf/template.newtxt b/examples/TGenshi/etc/dirvish/master.conf/template.newtxt deleted file mode 100644 index 6c9750f9d..000000000 --- a/examples/TGenshi/etc/dirvish/master.conf/template.newtxt +++ /dev/null @@ -1,25 +0,0 @@ -bank: - /backup - -image-default: %Y-%m-%d -log: bzip2 -index: bzip2 -xdev: 1 - -exclude: - lost+found/ - *~ - .nfs* - -Runall: -{% for user in metadata.Properties['dirvish.xml'].data.find('users') %}\ - homes/${user.tag} -{% end %}\ - -expire-default: +2 weeks - -expire-rule: -# MIN HR DOM MON DOW STRFTIME_FMT - * * * * 1 +6 weeks - * * 1-7 * 1 +6 months - * * 1-7 1,4,7,10 1 never |