aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2012-12-28 13:55:43 +0000
committerNicolas Vigier <boklm@mageia.org>2012-12-28 13:55:43 +0000
commit18854eb0a9eaa8bafaffe3bcb190de4e2b771e8d (patch)
treee7df0d6f086d8a3111055fbfb98f7e38456c3078
parent2968a23f47a59932c293e8d30e39b12c48da6160 (diff)
downloadpuppet-18854eb0.tar
puppet-18854eb0.tar.gz
puppet-18854eb0.tar.bz2
puppet-18854eb0.tar.xz
puppet-18854eb0.zip
subversion: remove CIA hooks
cia.vc does not exist anymore
-rw-r--r--modules/subversion/manifests/repository.pp17
-rwxr-xr-xmodules/subversion/templates/ciabot_svn.sh125
2 files changed, 0 insertions, 142 deletions
diff --git a/modules/subversion/manifests/repository.pp b/modules/subversion/manifests/repository.pp
index 0c656951..7d9d6265 100644
--- a/modules/subversion/manifests/repository.pp
+++ b/modules/subversion/manifests/repository.pp
@@ -2,9 +2,6 @@
# group : group that have commit access on the svn
# public : boolean if the svn is readable by anybody or not
# commit_mail : array of people who will receive mail after each commit
-# cia_post : send commits to cia.vc
-# cia_module : name of the module to send to cia.vc
-# cia_ignore_author : a regexp to ignore commits from some authors
# no_binary : do not accept files with common binary extensions
# on this repository
# restricted_to_user : restrict commits to select user
@@ -17,9 +14,6 @@ define subversion::repository($group = 'svn',
$public = true,
$commit_mail = '',
$i18n_mail = '',
- $cia_post = false,
- $cia_module = 'default',
- $cia_ignore_author = '',
$no_binary = false,
$restricted_to_user = false,
$syntax_check = '',
@@ -87,17 +81,6 @@ define subversion::repository($group = 'svn',
}
- if $cia_post {
- subversion::hook::post_commit { "$name|cia.vc":
- content => template('subversion/ciabot_svn.sh'),
- }
- } else {
- file { "$name/hooks/post-commit.d/cia.vc":
- ensure => absent,
- }
- }
-
-
if $no_binary {
pre_commit_link { "$name/hooks/pre-commit.d/no_binary": }
} else {
diff --git a/modules/subversion/templates/ciabot_svn.sh b/modules/subversion/templates/ciabot_svn.sh
deleted file mode 100755
index 9e1437cf..00000000
--- a/modules/subversion/templates/ciabot_svn.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-#
-# This is a CIA bot client script for Subversion repositories,
-# delivering via email. See below for usage and customization information.
-#
-# --------------------------------------------------------------------------
-#
-# Copyright (c) 2004-2005, Micah Dowty
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# * The name of the author may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# --------------------------------------------------------------------------
-#
-# See http://cia.vc for more information on what the CIA bot
-# is and how it works, and links to other client scripts.
-#
-# To use the CIA bot in your Subversion repository...
-#
-# 1. Customize the parameters below, specifically the ones under
-# the "Project information" section
-#
-# 2. This script should be called from your repository's post-commit
-# hook with the repository and revision as arguments. For example,
-# you could copy this script into your repository's "hooks" directory
-# and add something like the following to the "post-commit" script,
-# also in the repository's "hooks" directory:
-#
-# REPOS="$1"
-# REV="$2"
-# $REPOS/hooks/ciabot_svn.sh "$REPOS" "$REV"&
-#
-# ------ There are some parameters for this script that you can customize:
-
-# Project information
-#
-# NOTE: This shouldn't be a long description of your project. Ideally
-# it is a short identifier with no spaces, punctuation, or
-# unnecessary capitalization. This will be used in URLs related
-# to your project, as an internal identifier, and in IRC messages.
-# If you want a longer name shown for your project on the web
-# interface, please use the "title" metadata key rather than
-# putting that here.
-#
-project_name="Mageia"
-module_name="<%= cia_module %>"
-return_address="root@<%= @domain %>"
-ignore_author="<%= cia_ignore_author %>"
-
-# System
-sendmail_command="/usr/sbin/sendmail -t"
-
-############# Below this line you shouldn't have to change anything
-
-# Script arguments
-REPOS="$1"
-REV="$2"
-
-# The email address CIA lives at
-cia_address="cia@cia.vc"
-
-author=`svnlook author -r "$REV" "$REPOS" | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'`
-if test -n "$ignore_author" && echo "$author" | grep -q "$ignore_author"
-then
- exit 0
-fi
-log=`svnlook log -r "$REV" "$REPOS" | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'`
-diff_lines=`svnlook diff -r "$REV" "$REPOS" | wc -l`
-for file in `svnlook changed -r "$REV" "$REPOS" | cut -c 3- | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'`; do
- files="$files<file>$file</file>"
-done
-
-url="http://svnweb.<%= @domain%>/${REPOS/\/svn\//}?view=revision&amp;revision=$REV"
-
-# Send an email with the final XML message
-(cat <<EOF
-From: $return_address
-To: $cia_address
-Subject: DeliverXML
-
-<message>
- <generator>
- <name>Subversion CIA Bot client shell script</name>
- <version>1.1</version>
- </generator>
- <source>
- <project>$project_name</project>
- <module>$module_name</module>
- </source>
- <body>
- <commit>
- <revision>$REV</revision>
- <author>$author</author>
- <files>$files</files>
- <log>$log</log>
- <url>$url</url>
- <diffLines>$diff_lines</diffLines>
- </commit>
- </body>
-</message>
-EOF
-) | $sendmail_command
-
-### The End ###