[manual] Move puppet modules to the top level

The new puppet.conf file has to be moved into place manually. (imported from commit 253d9a95386dae8c803a998ce2dc7e8be40c880a)
2013-10-29 19:20:04 -04:00 · 2013-10-29 19:20:04 -04:00 · dd678465ae
parent 8ca76ba13f
commit dd678465ae
210 changed files with 12 additions and 13 deletions
--- a/servers/puppet/modules/apt
+++ b/servers/puppet/modules/apt
--- a/servers/puppet/modules/common
+++ b/servers/puppet/modules/common
--- a/servers/puppet/modules/puppet-apt/LICENSE
+++ b/servers/puppet/modules/puppet-apt/LICENSE
--- a/servers/puppet/modules/puppet-apt/Modulefile
+++ b/servers/puppet/modules/puppet-apt/Modulefile
--- a/servers/puppet/modules/puppet-apt/README.md
+++ b/servers/puppet/modules/puppet-apt/README.md
--- a/servers/puppet/modules/puppet-apt/files/10periodic
+++ b/servers/puppet/modules/puppet-apt/files/10periodic
--- a/servers/puppet/modules/puppet-apt/files/empty/.placeholder
+++ b/servers/puppet/modules/puppet-apt/files/empty/.placeholder
--- a/servers/puppet/modules/puppet-apt/lib/facter/apt_version.rb
+++ b/servers/puppet/modules/puppet-apt/lib/facter/apt_version.rb
--- a/servers/puppet/modules/puppet-apt/manifests/backports.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/backports.pp
--- a/servers/puppet/modules/puppet-apt/manifests/clean.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/clean.pp
--- a/servers/puppet/modules/puppet-apt/manifests/conf.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/conf.pp
--- a/servers/puppet/modules/puppet-apt/manifests/init.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/init.pp
--- a/servers/puppet/modules/puppet-apt/manifests/key.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/key.pp
--- a/servers/puppet/modules/puppet-apt/manifests/params.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/params.pp
--- a/servers/puppet/modules/puppet-apt/manifests/ppa.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/ppa.pp
--- a/servers/puppet/modules/puppet-apt/manifests/preferences.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/preferences.pp
--- a/servers/puppet/modules/puppet-apt/manifests/sources_list.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/sources_list.pp
--- a/servers/puppet/modules/puppet-apt/manifests/unattended-upgrade.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/unattended-upgrade.pp
--- a/servers/puppet/modules/puppet-apt/manifests/unattended-upgrade/automatic.pp
+++ b/servers/puppet/modules/puppet-apt/manifests/unattended-upgrade/automatic.pp
--- a/servers/puppet/modules/puppet-apt/templates/ppa-list.erb
+++ b/servers/puppet/modules/puppet-apt/templates/ppa-list.erb
--- a/servers/puppet/modules/puppet-apt/templates/preferences.erb
+++ b/servers/puppet/modules/puppet-apt/templates/preferences.erb
--- a/servers/puppet/modules/puppet-apt/templates/unattended-upgrades.Ubuntu.erb
+++ b/servers/puppet/modules/puppet-apt/templates/unattended-upgrades.Ubuntu.erb
--- a/servers/puppet/modules/puppet-apt/templates/unattended-upgrades.lenny.erb
+++ b/servers/puppet/modules/puppet-apt/templates/unattended-upgrades.lenny.erb
--- a/servers/puppet/modules/puppet-apt/templates/unattended-upgrades.squeeze.erb
+++ b/servers/puppet/modules/puppet-apt/templates/unattended-upgrades.squeeze.erb
--- a/servers/puppet/modules/puppet-common/README
+++ b/servers/puppet/modules/puppet-common/README
--- a/servers/puppet/modules/puppet-common/files/empty/.ignore
+++ b/servers/puppet/modules/puppet-common/files/empty/.ignore
--- a/servers/puppet/modules/puppet-common/files/modules/README
+++ b/servers/puppet/modules/puppet-common/files/modules/README
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/basename.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/basename.rb
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/dirname.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/dirname.rb
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/gsub.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/gsub.rb
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/hostname.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/hostname.rb
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/network_lookup.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/network_lookup.rb
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/prefix_with.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/prefix_with.rb
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/re_escape.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/re_escape.rb
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/slash_escape.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/slash_escape.rb
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/split.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/split.rb
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/substitute.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/substitute.rb
--- a/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/url_get.rb
+++ b/servers/puppet/modules/puppet-common/lib/puppet/parser/functions/url_get.rb
--- a/servers/puppet/modules/puppet-common/manifests/append_if_no_such_line.pp
+++ b/servers/puppet/modules/puppet-common/manifests/append_if_no_such_line.pp
--- a/servers/puppet/modules/puppet-common/manifests/assert_lsbdistcodename.pp
+++ b/servers/puppet/modules/puppet-common/manifests/assert_lsbdistcodename.pp
--- a/servers/puppet/modules/puppet-common/manifests/concatenated_file.pp
+++ b/servers/puppet/modules/puppet-common/manifests/concatenated_file.pp
--- a/servers/puppet/modules/puppet-common/manifests/concatenated_file_part.pp
+++ b/servers/puppet/modules/puppet-common/manifests/concatenated_file_part.pp
--- a/servers/puppet/modules/puppet-common/manifests/concatfilepart.pp
+++ b/servers/puppet/modules/puppet-common/manifests/concatfilepart.pp
--- a/servers/puppet/modules/puppet-common/manifests/config_file.pp
+++ b/servers/puppet/modules/puppet-common/manifests/config_file.pp
--- a/servers/puppet/modules/puppet-common/manifests/line.pp
+++ b/servers/puppet/modules/puppet-common/manifests/line.pp
--- a/servers/puppet/modules/puppet-common/manifests/modules_dir.pp
+++ b/servers/puppet/modules/puppet-common/manifests/modules_dir.pp
--- a/servers/puppet/modules/puppet-common/manifests/modules_file.pp
+++ b/servers/puppet/modules/puppet-common/manifests/modules_file.pp
--- a/servers/puppet/modules/puppet-common/manifests/replace.pp
+++ b/servers/puppet/modules/puppet-common/manifests/replace.pp
--- a/servers/puppet/modules/puppet-common/manifests/require_lsbdistcodename.pp
+++ b/servers/puppet/modules/puppet-common/manifests/require_lsbdistcodename.pp
--- a/servers/puppet/modules/puppet-common/tests/concatfilepart1.pp
+++ b/servers/puppet/modules/puppet-common/tests/concatfilepart1.pp
--- a/servers/puppet/modules/puppet-common/tests/concatfilepart2.pp
+++ b/servers/puppet/modules/puppet-common/tests/concatfilepart2.pp
--- a/servers/puppet/modules/puppet-common/tests/concatfilepart3.pp
+++ b/servers/puppet/modules/puppet-common/tests/concatfilepart3.pp
--- a/servers/puppet/modules/puppet-common/tests/concatfilepart4.pp
+++ b/servers/puppet/modules/puppet-common/tests/concatfilepart4.pp
--- a/servers/puppet/modules/puppet-common/tests/run-tests.sh
+++ b/servers/puppet/modules/puppet-common/tests/run-tests.sh
--- a/servers/puppet/modules/zulip-internal/files/apache/ports.conf
+++ b/servers/puppet/modules/zulip-internal/files/apache/ports.conf
--- a/servers/puppet/modules/zulip-internal/files/apache/sites/graphite
+++ b/servers/puppet/modules/zulip-internal/files/apache/sites/graphite
--- a/servers/puppet/modules/zulip-internal/files/apache/sites/graphiti
+++ b/servers/puppet/modules/zulip-internal/files/apache/sites/graphiti
--- a/servers/puppet/modules/zulip-internal/files/apache/sites/humbug-default
+++ b/servers/puppet/modules/zulip-internal/files/apache/sites/humbug-default
--- a/servers/puppet/modules/zulip-internal/files/apache/sites/mediawiki
+++ b/servers/puppet/modules/zulip-internal/files/apache/sites/mediawiki
--- a/servers/puppet/modules/zulip-internal/files/apache/sites/nagios
+++ b/servers/puppet/modules/zulip-internal/files/apache/sites/nagios
--- a/servers/puppet/modules/zulip-internal/files/apache/sites/stats
+++ b/servers/puppet/modules/zulip-internal/files/apache/sites/stats
--- a/servers/puppet/modules/zulip-internal/files/apache/sites/trac
+++ b/servers/puppet/modules/zulip-internal/files/apache/sites/trac
--- a/servers/puppet/modules/zulip-internal/files/builder/sbuildrc
+++ b/servers/puppet/modules/zulip-internal/files/builder/sbuildrc
--- a/servers/puppet/modules/zulip-internal/files/builder/ubuntu-archive-keyring.gpg
+++ b/servers/puppet/modules/zulip-internal/files/builder/ubuntu-archive-keyring.gpg
--- a/servers/puppet/modules/zulip-internal/files/camo_defaults
+++ b/servers/puppet/modules/zulip-internal/files/camo_defaults
--- a/servers/puppet/modules/zulip-internal/files/cron.d/active-user-stats
+++ b/servers/puppet/modules/zulip-internal/files/cron.d/active-user-stats
--- a/servers/puppet/modules/zulip-internal/files/cron.d/check-apns-tokens
+++ b/servers/puppet/modules/zulip-internal/files/cron.d/check-apns-tokens
--- a/servers/puppet/modules/zulip-internal/files/cron.d/clearsessions
+++ b/servers/puppet/modules/zulip-internal/files/cron.d/clearsessions
--- a/servers/puppet/modules/zulip-internal/files/cron.d/email-mirror
+++ b/servers/puppet/modules/zulip-internal/files/cron.d/email-mirror
--- a/puppet/zulip-internal/files/cron.d/graphite_backup
+++ b/puppet/zulip-internal/files/cron.d/graphite_backup
@ -0,0 +1,4 @@
+MAILTO=root
+SHELL=/bin/bash
+
+0 3 * * * zulip /home/zulip/zulip/puppet/zulip-internal/files/graphite/daily_rsync_backup.sh
--- a/servers/puppet/modules/zulip-internal/files/cron.d/test_zephyr_personal_mirrors
+++ b/servers/puppet/modules/zulip-internal/files/cron.d/test_zephyr_personal_mirrors
--- a/servers/puppet/modules/zulip-internal/files/cron.d/zephyr-mirror
+++ b/servers/puppet/modules/zulip-internal/files/cron.d/zephyr-mirror
--- a/servers/puppet/modules/zulip-internal/files/debathena.list
+++ b/servers/puppet/modules/zulip-internal/files/debathena.list
--- a/servers/puppet/modules/zulip-internal/files/graphite/aggregation-rules.conf
+++ b/servers/puppet/modules/zulip-internal/files/graphite/aggregation-rules.conf
--- a/servers/puppet/modules/zulip-internal/files/graphite/carbon.conf
+++ b/servers/puppet/modules/zulip-internal/files/graphite/carbon.conf
--- a/servers/puppet/modules/zulip-internal/files/graphite/daily_rsync_backup.sh
+++ b/servers/puppet/modules/zulip-internal/files/graphite/daily_rsync_backup.sh
--- a/servers/puppet/modules/zulip-internal/files/graphite/graphite.wsgi
+++ b/servers/puppet/modules/zulip-internal/files/graphite/graphite.wsgi
--- a/servers/puppet/modules/zulip-internal/files/graphite/local_settings.py
+++ b/servers/puppet/modules/zulip-internal/files/graphite/local_settings.py
--- a/servers/puppet/modules/zulip-internal/files/graphite/setup_disks.sh
+++ b/servers/puppet/modules/zulip-internal/files/graphite/setup_disks.sh
--- a/servers/puppet/modules/zulip-internal/files/graphite/storage-aggregation.conf
+++ b/servers/puppet/modules/zulip-internal/files/graphite/storage-aggregation.conf
--- a/servers/puppet/modules/zulip-internal/files/graphite/storage-schemas.conf
+++ b/servers/puppet/modules/zulip-internal/files/graphite/storage-schemas.conf
--- a/servers/puppet/modules/zulip-internal/files/graphiti/settings.yml
+++ b/servers/puppet/modules/zulip-internal/files/graphiti/settings.yml
--- a/servers/puppet/modules/zulip-internal/files/iptables/rules.zmirror
+++ b/servers/puppet/modules/zulip-internal/files/iptables/rules.zmirror
--- a/servers/puppet/modules/zulip-internal/files/mediawiki/Auth_remoteuser.php
+++ b/servers/puppet/modules/zulip-internal/files/mediawiki/Auth_remoteuser.php
--- a/servers/puppet/modules/zulip-internal/files/mediawiki/LocalSettings.php
+++ b/servers/puppet/modules/zulip-internal/files/mediawiki/LocalSettings.php
--- a/servers/puppet/modules/zulip-internal/files/mediawiki/apache_config
+++ b/servers/puppet/modules/zulip-internal/files/mediawiki/apache_config
--- a/servers/puppet/modules/zulip-internal/files/motd.lb0
+++ b/servers/puppet/modules/zulip-internal/files/motd.lb0
--- a/servers/puppet/modules/zulip-internal/files/munin-plugins/humbug_send_receive
+++ b/servers/puppet/modules/zulip-internal/files/munin-plugins/humbug_send_receive
--- a/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_connections
+++ b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_connections
--- a/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_consumers
+++ b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_consumers
--- a/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages
+++ b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages
--- a/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages_unacknowledged
+++ b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages_unacknowledged
--- a/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages_uncommitted
+++ b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_messages_uncommitted
--- a/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_queue_memory
+++ b/servers/puppet/modules/zulip-internal/files/munin-plugins/rabbitmq_queue_memory
--- a/servers/puppet/modules/zulip-internal/files/munin-plugins/tornado_event_queues
+++ b/servers/puppet/modules/zulip-internal/files/munin-plugins/tornado_event_queues
--- a/servers/puppet/modules/zulip-internal/files/munin/munin-node.conf
+++ b/servers/puppet/modules/zulip-internal/files/munin/munin-node.conf
--- a/servers/puppet/modules/zulip-internal/files/munin/munin.conf
+++ b/servers/puppet/modules/zulip-internal/files/munin/munin.conf
--- a/servers/puppet/modules/zulip-internal/files/munin/plugin-conf.d/munin-node.conf
+++ b/servers/puppet/modules/zulip-internal/files/munin/plugin-conf.d/munin-node.conf
--- a/servers/puppet/modules/zulip-internal/files/nagios3/cgi.cfg
+++ b/servers/puppet/modules/zulip-internal/files/nagios3/cgi.cfg
--- a/servers/puppet/modules/zulip-internal/files/nagios3/commands.cfg
+++ b/servers/puppet/modules/zulip-internal/files/nagios3/commands.cfg
--- a/Show More
+++ b/Show More