summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sitemodules/profiles/files/debarchive/debarchive.service2
-rw-r--r--sitemodules/profiles/manifests/debarchive.pp14
2 files changed, 2 insertions, 14 deletions
diff --git a/sitemodules/profiles/files/debarchive/debarchive.service b/sitemodules/profiles/files/debarchive/debarchive.service
index 0fc3555..ec6f12e 100644
--- a/sitemodules/profiles/files/debarchive/debarchive.service
+++ b/sitemodules/profiles/files/debarchive/debarchive.service
@@ -3,7 +3,7 @@ Description=CAcert Debian Archive Update service
[Service]
Type=forking
-ExecStart=/usr/bin/mini-dinstall
+ExecStart=/usr/bin/mini-dinstall /srv/upload/incoming
ExecStop=/usr/bin/mini-dinstall -k
User=debarchive
diff --git a/sitemodules/profiles/manifests/debarchive.pp b/sitemodules/profiles/manifests/debarchive.pp
index e075137..8124ddf 100644
--- a/sitemodules/profiles/manifests/debarchive.pp
+++ b/sitemodules/profiles/manifests/debarchive.pp
@@ -70,19 +70,7 @@ class profiles::debarchive (
group => 'nogroup',
mode => '0711',
}
- file { '/srv/debarchive/archive':
- ensure => directory,
- owner => 'debarchive',
- group => 'nogroup',
- mode => '0711',
- }
- file { '/srv/debarchive/archive/mini-dinstall':
- ensure => directory,
- owner => 'debarchive',
- group => 'nogroup',
- mode => '0711',
- }
- file { '/srv/debarchive/archive/mini-dinstall/incoming':
+ file { '/srv/upload/incoming':
ensure => directory,
owner => 'debarchive',
group => 'nogroup',