From ebf3a00ed190f566685f8011ee28ccc6e94bb952 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 6 Jan 2015 00:18:35 +0100 Subject: [PATCH] now part of the official package https://bugzilla.redhat.com/show_bug.cgi?id=1161033 --- files/CentOS/tinc.systemd | 12 ------------ manifests/centos.pp | 7 ------- 2 files changed, 19 deletions(-) delete mode 100644 files/CentOS/tinc.systemd diff --git a/files/CentOS/tinc.systemd b/files/CentOS/tinc.systemd deleted file mode 100644 index 2b71368..0000000 --- a/files/CentOS/tinc.systemd +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Tinc VPN daemon for network %i -After=network.target - -[Service] -Type=forking -Restart=on-failure -ExecStart=/usr/sbin/tincd -n %i -ExecStop=/usr/sbin/tincd -n %i -k - -[Install] -WantedBy=multi-user.target diff --git a/manifests/centos.pp b/manifests/centos.pp index 530f1cd..bcd6d54 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -1,13 +1,6 @@ # manage centos specific things class tinc::centos inherits tinc::base { if $tinc::uses_systemd { - file{'/etc/systemd/system/tincd@.service': - source => 'puppet:///modules/tinc/CentOS/tinc.systemd', - require => Package['tinc'], - owner => root, - group => 0, - mode => '0644'; - } # systemd manages per instance Service['tinc'] { ensure => undef,