handle duplicates between social and pcr

5 files changed, 0 insertions, 218 deletions

diff --git a/social/puppet/PKGBUILD b/social/puppet/PKGBUILD
deleted file mode 100644
index 10338bea0..000000000
--- a/social/puppet/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Puppet: Installer: Arch
-# Maintainer: Thomas S Hatch <thatch45 (at) Gmail (dot) com>
-# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
-# Contributor: Miah Johnson <miah (at) chia-pet dot org>
-# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com>
-
-pkgname=puppet
-pkgver=2.7.1
-pkgrel=1
-pkgdesc="A system for automating system administration tasks."
-arch=("any")
-url="http://puppetlabs.com/projects/puppet/"
-license=("Apache")
-depends=("ruby" "ruby-shadow" "facter")
-backup=("etc/puppet/puppet.conf")
-options=(emptydirs)
-install="puppet.install"
-source=("http://puppetlabs.com/downloads/puppet/puppet-$pkgver.tar.gz"
-        "puppet"
-        "puppetmaster"
-        "puppet.conf")
-md5sums=('7a0346758af0222dc5e2b2b1a99c44ec'
-         '59dbf39e251bc4877e7604a5876c642d'
-         '4c507c580cb28d7a5adc9ea6b3626657'
-         'a6c0ce2eb12d62fdd3421aa9dff3477d')
-
-package() {
-  cd $srcdir/puppet-$pkgver
-
-  # Install
-  ruby ./install.rb \
-    --destdir=$pkgdir \
-    --bindir=/usr/bin \
-    --sbindir=/usr/sbin \
-    --mandir=/usr/share/man
-
-  # Set up vim and emacs
-  install -Dp -m0644 ext/vim/ftdetect/puppet.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/puppet.vim
-  install -Dp -m0644 ext/vim/syntax/puppet.vim $pkgdir/usr/share/vim/vimfiles/syntax/puppet.vim
-  install -Dp -m0644 ext/emacs/puppet-mode.el $pkgdir/usr/share/emacs/site-lisp/puppet-mode.el
-  install -Dp -m0644 ext/emacs/puppet-mode-init.el $pkgdir/usr/share/emacs/site-lisp/site-start.d/puppet-mode-init.el
-  
-  # Configuration and rc scripts
-  install -d $pkgdir/etc/{puppet,rc.d}
-  install -m 644 $srcdir/puppet.conf $pkgdir/etc/puppet/puppet.conf
-
-  install -D $srcdir/puppet $pkgdir/etc/rc.d/puppet
-  install -D $srcdir/puppetmaster $pkgdir/etc/rc.d/puppetmaster
-
-  # Move pi to prevent file conflict
-  mv $pkgdir/usr/bin/pi $pkgdir/usr/bin/puppet-pi
-}
diff --git a/social/puppet/puppet b/social/puppet/puppet
deleted file mode 100755
index 4126be850..000000000
--- a/social/puppet/puppet
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-DAEMON=$(type -p puppetd)
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/puppet ] && . /etc/conf.d/puppet
-
-PID=$(pidof -xo %PPID $DAEMON)
-case "$1" in
-  start)
-    stat_busy "Starting Puppet Daemon"
-    if [ -z "$PID" ]; then 
-      [ -f /var/run/puppet.pid ] && rm -f /var/run/puppet.pid
-      $DAEMON $PUPPETD_ARGS
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -xo %PPID $DAEMON)
-      echo $PID > /var/run/puppet.pid
-      add_daemon puppet
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Puppet Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon puppet
-      rm -f /var/run/puppet.pid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    if [ ! -z $PID ]; then
-      while ps -p $PID > /dev/null; do sleep 1; done
-    fi
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/social/puppet/puppet.conf b/social/puppet/puppet.conf
deleted file mode 100644
index 169f28b3b..000000000
--- a/social/puppet/puppet.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-[main]
-    # The Puppet log directory.
-    # The default value is '$vardir/log'.
-    logdir = /var/log/puppet
-
-    # Where Puppet PID files are kept.
-    # The default value is '$vardir/run'.
-    rundir = /var/run/puppet
-
-    # Where SSL certificates are kept.
-    # The default value is '$confdir/ssl'.
-    ssldir = $vardir/ssl
-    factpath=$vardir/lib/facter
-    pluginsync=true
-
-
-[agent]
-    # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
-    # the separate ``puppet`` executable using the ``--loadclasses``
-    # option.
-    # The default value is '$confdir/classes.txt'.
-    classfile = $vardir/classes.txt
-
-    # Where puppetd caches the local configuration.  An
-    # extension indicating the cache format is added automatically.
-    # The default value is '$confdir/localconfig'.
-    localconfig = $vardir/localconfig
-
-#[master]
diff --git a/social/puppet/puppet.install b/social/puppet/puppet.install
deleted file mode 100644
index 928df566b..000000000
--- a/social/puppet/puppet.install
+++ /dev/null
@@ -1,46 +0,0 @@
-# Puppet: Installer: Arch
-# Maintainer: Thomas S Hatch <thatch45 (at) Gmail (dot) com>
-# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
-# Contributor: Miah Johnson <Miah (at) chia-pet dot org>
-
-pre_install() {
-  getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null
-  getent passwd puppet &>/dev/null || useradd -r -u 52 -g puppet -d /var/lib/puppet -s /sbin/nologin -c "Puppet" puppet &>/dev/null || :
-}
-
-pre_upgrade() {
-  pre_install
-  usermod -d /var/lib/puppet puppet &>/dev/null || :
-}
-
-post_install() {
-    :
-}
-
-pre_remove() {
-if [ -f /var/run/puppetmasterd.pid ]; then
-	PIDOF=$(pidof -xo %PPID puppetmasterd)
-	PIDFILE=$(cat /var/run/puppetmasterd.pid)
-	if [ $PIDOF -eq $PIDFILE ]; then
-		/etc/rc.d/puppetmaster stop
-	fi
-fi
-
-if [ -f /var/run/puppetd.pid ]; then
-	PIDOF=$(pidof -xo %PPID puppetd)
-	PIDFILE=$(cat /var/run/puppetd.pid)
-	if [ $PIDOF -eq $PIDFILE ]; then
-		/etc/rc.d/puppet stop
-	fi
-fi
-}
-
-post_remove() {
-	# Remove user and group
-	userdel puppet
-}
-
-op=$1
-shift
-
-$op "$@"
diff --git a/social/puppet/puppetmaster b/social/puppet/puppetmaster
deleted file mode 100755
index 8b3971053..000000000
--- a/social/puppet/puppetmaster
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-DAEMON=$(type -p puppetmasterd)
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/puppetmaster ] && . /etc/conf.d/puppetmaster
-
-PID=$(pidof -xo %PPID $DAEMON)
-case "$1" in
-  start)
-    stat_busy "Starting Puppet Master Daemon"
-    if [ -z "$PID" ]; then 
-      [ -f /var/run/puppetmaster.pid ] && rm -f /var/run/puppetmaster.pid
-      $DAEMON $PUPPETMASTER_ARGS
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -xo %PPID $DAEMON)
-      echo $PID > /var/run/puppetmaster.pid
-      add_daemon puppetmaster
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Puppet Master Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon puppetmaster
-      rm -f /var/run/puppetmaster.pid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    if [ ! -z $PID ]; then
-      while ps -p $PID > /dev/null; do sleep 1; done
-    fi
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac