diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-08-18 19:26:35 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-08-18 19:26:35 +0200 |
| commit | 6667f52e8017065c9b5f14c8025458b38029a800 (patch) | |
| tree | 3819efff8336fdda1fef8fc78fd2fbc0791693af /modules/base_installation/templates/puppet/puppet.conf.erb | |
| parent | 19c467dccfd00193a66f1341f068987da7bca14b (diff) | |
| parent | 3c90c9020fc4e0257fa4c73f14e609e3559b3771 (diff) | |
| download | Puppet-6667f52e8017065c9b5f14c8025458b38029a800.tar.gz Puppet-6667f52e8017065c9b5f14c8025458b38029a800.tar.zst Puppet-6667f52e8017065c9b5f14c8025458b38029a800.zip | |
Merge branch 'file_store' into dev
Diffstat (limited to 'modules/base_installation/templates/puppet/puppet.conf.erb')
| -rw-r--r-- | modules/base_installation/templates/puppet/puppet.conf.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/base_installation/templates/puppet/puppet.conf.erb b/modules/base_installation/templates/puppet/puppet.conf.erb index da39468..38a0c1b 100644 --- a/modules/base_installation/templates/puppet/puppet.conf.erb +++ b/modules/base_installation/templates/puppet/puppet.conf.erb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | [main] | 1 | [main] |
| 2 | <% | 2 | <% |
| 3 | reports = ["store"] | 3 | reports = ["store", "cat_files"] |
| 4 | if @xmpp.count > 0 | 4 | if @xmpp.count > 0 |
| 5 | reports << "xmpp" | 5 | reports << "xmpp" |
| 6 | end | 6 | end |