diff options
author | mh <mh@immerda.ch> | 2011-05-21 14:36:05 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2011-05-21 14:36:05 +0200 |
commit | 02d980eb889c8b7754226a3988ab51dea35310c4 (patch) | |
tree | 1f555408bd99e0aa8c3218b88e325d53f600ecd6 | |
parent | ed66ce583464642bfaf2616615d7d237794b420e (diff) |
Remove init.d file
this was anyway too specific for centos and it is now part of our
package.
-rw-r--r-- | files/centos/ipsec.init | 72 | ||||
-rw-r--r-- | manifests/base.pp | 13 |
2 files changed, 3 insertions, 82 deletions
diff --git a/files/centos/ipsec.init b/files/centos/ipsec.init deleted file mode 100644 index 5a4edba..0000000 --- a/files/centos/ipsec.init +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# IPsec startup and shutdown script -# Copyright (C) 1998, 1999, 2001 Henry Spencer. -# Copyright (C) 2002 Michael Richardson <mcr@freeswan.org> -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# RCSID $Id: setup.in,v 1.122.6.8 2007-11-07 02:36:05 paul Exp $ -# -# ipsec init.d script for starting and stopping -# the IPsec security subsystem (KLIPS and Pluto). -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# RCSID $Id: setup.in,v 1.122.6.8 2007-11-07 02:36:05 paul Exp $ -# -# ipsec init.d script for starting and stopping -# the IPsec security subsystem (KLIPS and Pluto). -# -# This script becomes /etc/rc.d/init.d/ipsec (or possibly /etc/init.d/ipsec) -# and is also accessible as "ipsec setup" (the preferred route for human -# invocation). -# -# The startup and shutdown times are a difficult compromise (in particular, -# it is almost impossible to reconcile them with the insanely early/late -# times of NFS filesystem startup/shutdown). Startup is after startup of -# syslog and pcmcia support; shutdown is just before shutdown of syslog. -# -# chkconfig: 2345 47 76 -# description: IPsec provides encrypted and authenticated communications; \ -# KLIPS is the kernel half of it, Pluto is the user-level management daemon. - -prog=ipsec - -case "$1" in - start) - /usr/sbin/ipsec start - ;; - stop) - /usr/sbin/ipsec stop - ;; - - reload) - /usr/sbin/ipsec reload - ;; - - restart|force-reload) - /usr/sbin/ipsec restart - ;; - - status) - /usr/sbin/ipsec status - exit - ;; - - *) - echo "Usage: $prog {start|stop|restart|condrestart|reload|status}" - exit 1 -esac - -exit 0 diff --git a/manifests/base.pp b/manifests/base.pp index 9d5cb7d..be04615 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -9,17 +9,10 @@ class strongswan::base { ensure => installed, } - file{'/etc/init.d/ipsec': - source => "puppet:///modules/strongswan/centos/ipsec.init", - require => Package['strongswan'], - before => Service['ipsec'], - owner => root, group => 0, mode => 0755; - } - if $selinux == 'true' { - File['/etc/init.d/ipsec']{ - seltype => 'ipsec_initrc_exec_t', - } + package{ 'strongswan-selinux' : + ensure => installed, + } } exec{ 'ipsec_privatekey': |