summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/inoticoming.default.erb2
-rw-r--r--templates/reprepro-export-key.sh.erb18
2 files changed, 1 insertions, 19 deletions
diff --git a/templates/inoticoming.default.erb b/templates/inoticoming.default.erb
index a298a16..dd4d55d 100644
--- a/templates/inoticoming.default.erb
+++ b/templates/inoticoming.default.erb
@@ -5,7 +5,7 @@
# for an explanation of options and actions, see inoticoming(1)
# user to run inoticoming as
-USER=reprepro
+USER=<%= @user %>
# log to some file instead of syslog
# required if you want to use --stdout-to-log or --stderr-to-log in actions
diff --git a/templates/reprepro-export-key.sh.erb b/templates/reprepro-export-key.sh.erb
deleted file mode 100644
index bbc195c..0000000
--- a/templates/reprepro-export-key.sh.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# This file is managed by Puppet. Do not edit, any changes will be overwritten!
-#
-
-set -e
-
-KEY="$(gpg --homedir '<%= @basedir %>/.gnupg' --with-colon --list-secret-keys | cut -d : -f 5 | head -n 1)"
-
-if [ -n "$KEY" ]; then
- TEMPFILE=$(mktemp --tmpdir='<%= @basedir %>')
- trap "rm -f '$TEMPFILE'" EXIT
- DESTFILE='<%= @basedir %>/key.asc'
- gpg --homedir '<%= @basedir %>/.gnupg' --export --armor "$KEY" > "$TEMPFILE"
- mv "$TEMPFILE" "$DESTFILE"
- chown reprepro:reprepro "$DESTFILE"
- chmod 0664 "$DESTFILE"
-fi