Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86749
Change subject: Add .deploy to a system-wide ignore file
......................................................................
Add .deploy to a system-wide ignore file
All repos on the deployment system should ignore .deploy; this
change adds this ignore system-wide.
Change-Id: I0a7ec71786b0105ea4cc278c56fa38bd5dbcf6c1
---
M modules/deployment/manifests/deployment_server.pp
M modules/deployment/templates/git-deploy/gitconfig.erb
A modules/deployment/templates/git-deploy/gitignore.erb
3 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/86749/1
diff --git a/modules/deployment/manifests/deployment_server.pp
b/modules/deployment/manifests/deployment_server.pp
index 0c957a6..47ce313 100644
--- a/modules/deployment/manifests/deployment_server.pp
+++ b/modules/deployment/manifests/deployment_server.pp
@@ -1,4 +1,4 @@
-class
deployment::deployment_server($deployment_conffile="/etc/git-deploy/git-deploy.conf",
$deployment_restrict_umask="002",
$deployment_block_file="/etc/ROLLOUTS_BLOCKED", $deployment_support_email="",
$deployment_repo_name_detection="dot-git-parent-dir",
$deployment_announce_email="", $deployment_send_mail_on_sync="false",
$deployment_send_mail_on_revert="false",
$deployment_log_directory="/var/log/git-deploy",
$deployment_log_timing_data="false",
$deployment_git_deploy_dir="/var/lib/git-deploy",
$deployment_per_repo_config={}) {
+class
deployment::deployment_server($deployment_conffile="/etc/git-deploy/git-deploy.conf",
$deployment_ignorefile="/etc/git-deploy/gitignore",
$deployment_ignores=['.deploy'], $deployment_restrict_umask="002",
$deployment_block_file="/etc/ROLLOUTS_BLOCKED", $deployment_support_email="",
$deployment_repo_name_detection="dot-git-parent-dir",
$deployment_announce_email="", $deployment_send_mail_on_sync="false",
$deployment_send_mail_on_revert="false",
$deployment_log_directory="/var/log/git-deploy",
$deployment_log_timing_data="false",
$deployment_git_deploy_dir="/var/lib/git-deploy",
$deployment_per_repo_config={}) {
if ! defined(Package["git-deploy"]){
package { "git-deploy":
ensure => present;
@@ -71,6 +71,11 @@
mode => 0444,
owner => root,
group => root;
+ "${deployment_ignorefile}":
+ content => template("deployment/git-deploy/gitignore.erb"),
+ mode => 0444,
+ owner => root,
+ group => root;
"/usr/local/bin/deploy-info":
owner => root,
group => root,
diff --git a/modules/deployment/templates/git-deploy/gitconfig.erb
b/modules/deployment/templates/git-deploy/gitconfig.erb
index f439c6b..48bd6c8 100644
--- a/modules/deployment/templates/git-deploy/gitconfig.erb
+++ b/modules/deployment/templates/git-deploy/gitconfig.erb
@@ -1,2 +1,4 @@
[deploy]
config-file = <%= deployment_conffile %>
+[core]
+ excludesfile = <%= deployment_ignorefile %>
diff --git a/modules/deployment/templates/git-deploy/gitignore.erb
b/modules/deployment/templates/git-deploy/gitignore.erb
new file mode 100644
index 0000000..db6ca81
--- /dev/null
+++ b/modules/deployment/templates/git-deploy/gitignore.erb
@@ -0,0 +1,3 @@
+<% deployment_ignores.each do |deployment_ignore| %>
+<%= deployment_ignore %>
+<% end %>
--
To view, visit https://gerrit.wikimedia.org/r/86749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a7ec71786b0105ea4cc278c56fa38bd5dbcf6c1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
