From e97486db5fae20a5a1c601e86b7a7f3763e1c1c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 17:57:39 -0500
Subject: make the key script support multiple repositories

---
 files/reprepro-export-key.sh         | 19 +++++++++++++++++++
 templates/reprepro-export-key.sh.erb | 18 ------------------
 2 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 files/reprepro-export-key.sh
 delete mode 100644 templates/reprepro-export-key.sh.erb

diff --git a/files/reprepro-export-key.sh b/files/reprepro-export-key.sh
new file mode 100644
index 0000000..6e0b278
--- /dev/null
+++ b/files/reprepro-export-key.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# This file is managed by Puppet. Do not edit, any changes will be overwritten!
+#
+
+set -e
+
+BASEDIR="$1"
+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
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
-- 
cgit v1.2.3


From bf6dd071100eb4283532b59cec5288ed2d3b055b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 17:58:06 -0500
Subject: move parametrized class elements into a define to support multiple
 repositories

---
 manifests/init.pp | 59 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index e96cf2d..fa48663 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,15 +1,4 @@
-class reprepro (
-  $uploaders,
-  $basedir = '/srv/reprepro',
-  $origin  = $::domain,
-  $architectures  = [ 'amd64', 'i386', 'source' ],
-  $basedir_mode  = '0771',
-  $incoming_mode = '1777',
-  $manage_distributions_conf    = true,
-  $manage_incoming_conf         = true,
-  $handle_incoming_with_cron    = false,
-  $handle_incoming_with_inotify = false
-){
+class reprepro {
   package {
     "reprepro": ensure => 'installed';
   }
@@ -29,6 +18,35 @@ class reprepro (
     }
   }
 
+  file { '/usr/local/bin/reprepro-export-key':
+    ensure  => present,
+    source => "puppet:///modules/reprepro/reprepro-export-key.sh",
+    owner   => root,
+    group   => root,
+    mode    => '0755',
+  }
+}
+
+class reprepro::inotify {
+  package { 'inoticoming':
+    ensure => 'present',
+  }
+}
+
+define reprepro::repository (
+  $uploaders,
+  $basedir = '/srv/reprepro',
+  $origin  = $::domain,
+  $architectures  = [ 'amd64', 'i386', 'source' ],
+  $basedir_mode  = '0771',
+  $incoming_mode = '1777',
+  $manage_distributions_conf    = true,
+  $manage_incoming_conf         = true,
+  $handle_incoming_with_cron    = false,
+  $handle_incoming_with_inotify = false
+) {
+  include reprepro
+
   File {
     owner => reprepro,
     group => reprepro,
@@ -83,14 +101,8 @@ class reprepro (
     ensure => present,
     mode => '0600',
   }
-  file { '/usr/local/bin/reprepro-export-key':
-    ensure  => present,
-    content => template('reprepro/reprepro-export-key.sh.erb'),
-    owner   => root,
-    group   => root,
-    mode    => '0755',
-  }
-  exec { "/usr/local/bin/reprepro-export-key":
+
+  exec { "/usr/local/bin/reprepro-export-key '$basedir'":
     creates     => "$basedir/key.asc",
     user        => reprepro,
     subscribe   => File["$basedir/.gnupg/secring.gpg"],
@@ -140,7 +152,7 @@ class reprepro (
     default => absent,
   }
 
-  cron { 'reprepro':
+  cron { "reprepro-$name":
     ensure  => $cron_presence,
     command => "/usr/bin/reprepro --silent -b $basedir processincoming incoming",
     user    => reprepro,
@@ -160,9 +172,10 @@ class reprepro (
     default => false,
   }
 
-  package { 'inoticoming':
-    ensure => $inoticoming_presence,
+  if $handle_incoming_with_inotify {
+    include reprepro::inotify
   }
+
   file { '/etc/init.d/reprepro':
     ensure => $inoticoming_presence,
     owner  => root,
-- 
cgit v1.2.3


From ee04b392d9e33958b899aff1e2f9faf3620fccba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 18:01:09 -0500
Subject: split all resources in their own files

---
 manifests/init.pp       | 176 ------------------------------------------------
 manifests/inotify.pp    |   5 ++
 manifests/repository.pp | 169 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 174 insertions(+), 176 deletions(-)
 create mode 100644 manifests/inotify.pp
 create mode 100644 manifests/repository.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index fa48663..21a1836 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,179 +26,3 @@ class reprepro {
     mode    => '0755',
   }
 }
-
-class reprepro::inotify {
-  package { 'inoticoming':
-    ensure => 'present',
-  }
-}
-
-define reprepro::repository (
-  $uploaders,
-  $basedir = '/srv/reprepro',
-  $origin  = $::domain,
-  $architectures  = [ 'amd64', 'i386', 'source' ],
-  $basedir_mode  = '0771',
-  $incoming_mode = '1777',
-  $manage_distributions_conf    = true,
-  $manage_incoming_conf         = true,
-  $handle_incoming_with_cron    = false,
-  $handle_incoming_with_inotify = false
-) {
-  include reprepro
-
-  File {
-    owner => reprepro,
-    group => reprepro,
-  }
-
-  file { "$basedir":
-    ensure => directory,
-    mode => $basedir_mode,
-  }
-  file { "$basedir/conf":
-    ensure => directory,
-    mode => '0770',
-  }
-  file { "$basedir/db":
-    ensure => directory,
-    mode => '0770',
-  }
-  file { "$basedir/dists":
-    ensure => directory,
-    mode => '0775',
-  }
-  file { "$basedir/pool":
-    ensure => directory,
-    mode => '0775',
-  }
-  file { "$basedir/incoming":
-    ensure => directory,
-    mode => $incoming_mode,
-  }
-  file { "$basedir/logs":
-    ensure => directory,
-    mode => '0775',
-  }
-  file { "$basedir/tmp":
-    ensure => directory,
-    mode => '0775',
-  }
-  file { "$basedir/conf/uploaders":
-    mode => '0660', owner => root,
-    content => template("reprepro/uploaders.erb"),
-  }
-  file { "$basedir/index.html":
-    mode => '0664', owner => root,
-    content => template("reprepro/index.html.erb"),
-  }
-
-  file { "$basedir/.gnupg":
-    ensure => directory,
-    mode => '0700',
-  }
-  file { "$basedir/.gnupg/secring.gpg":
-    ensure => present,
-    mode => '0600',
-  }
-
-  exec { "/usr/local/bin/reprepro-export-key '$basedir'":
-    creates     => "$basedir/key.asc",
-    user        => reprepro,
-    subscribe   => File["$basedir/.gnupg/secring.gpg"],
-    require     => File["/usr/local/bin/reprepro-export-key"],
-  }
-
-
-  file { "$basedir/conf/distributions":
-    ensure => present,
-  }
-  if $manage_distributions_conf {
-    File["$basedir/conf/distributions"] {
-      owner   => root,
-      mode    => '0664',
-      content => template("reprepro/distributions.erb"),
-    }
-
-    exec { "reprepro -b $basedir createsymlinks":
-        refreshonly => true,
-        subscribe => File["$basedir/conf/distributions"],
-        user => reprepro,
-        path => "/usr/bin:/bin",
-    }
-    exec { "reprepro -b $basedir export":
-        refreshonly => true,
-        user => reprepro,
-        subscribe => File["$basedir/conf/distributions"],
-        path => "/usr/bin:/bin",
-    }
-  }
-
-  file { "$basedir/conf/incoming":
-    ensure => present,
-  }
-  if $manage_incoming_conf {
-    File["$basedir/conf/incoming"] {
-      mode => '0664',
-      owner => root,
-      source => "puppet:///modules/reprepro/incoming"
-    }
-  }
-
-  # Handling of incoming with cron
-
-  $cron_presence = $handle_incoming_with_cron ? {
-    true    => present,
-    default => absent,
-  }
-
-  cron { "reprepro-$name":
-    ensure  => $cron_presence,
-    command => "/usr/bin/reprepro --silent -b $basedir processincoming incoming",
-    user    => reprepro,
-    minute  => '*/5',
-    require => [ Package['reprepro'], File["$basedir/conf/distributions"],
-                 File["$basedir/incoming"], ],
-  }
-
-  # Handling of incoming with inoticoming
-
-  $inoticoming_presence = $handle_incoming_with_inotify ? {
-    true    => present,
-    default => absent,
-  }
-  $inoticoming_enabled = $handle_incoming_with_inotify ? {
-    true    => true,
-    default => false,
-  }
-
-  if $handle_incoming_with_inotify {
-    include reprepro::inotify
-  }
-
-  file { '/etc/init.d/reprepro':
-    ensure => $inoticoming_presence,
-    owner  => root,
-    group  => root,
-    mode   => '0755',
-    source => "puppet:///modules/reprepro/inoticoming.init",
-  }
-  file { '/etc/default/reprepro':
-    ensure  => $inoticoming_presence,
-    owner   => root, group => root, mode => '0755',
-    content => template('reprepro/inoticoming.default.erb'),
-  }
-
-  service { 'reprepro':
-    ensure => $inoticoming_enabled,
-    enable => $inoticoming_enabled,
-    pattern => 'inoticoming.*reprepro.*processincoming',
-    require => [ Package['inoticoming'],
-                 File['/etc/default/reprepro'],
-                 File['/etc/init.d/reprepro'],
-                 File["$basedir/incoming"] ],
-  }
-
-# TODO: setup needeed lines in apache site config file
-
-}
diff --git a/manifests/inotify.pp b/manifests/inotify.pp
new file mode 100644
index 0000000..491fb04
--- /dev/null
+++ b/manifests/inotify.pp
@@ -0,0 +1,5 @@
+class reprepro::inotify {
+  package { 'inoticoming':
+    ensure => 'present',
+  }
+}
diff --git a/manifests/repository.pp b/manifests/repository.pp
new file mode 100644
index 0000000..431093d
--- /dev/null
+++ b/manifests/repository.pp
@@ -0,0 +1,169 @@
+define reprepro::repository (
+  $uploaders,
+  $basedir = '/srv/reprepro',
+  $origin  = $::domain,
+  $architectures  = [ 'amd64', 'i386', 'source' ],
+  $basedir_mode  = '0771',
+  $incoming_mode = '1777',
+  $manage_distributions_conf    = true,
+  $manage_incoming_conf         = true,
+  $handle_incoming_with_cron    = false,
+  $handle_incoming_with_inotify = false
+) {
+  include reprepro
+
+  File {
+    owner => reprepro,
+    group => reprepro,
+  }
+
+  file { "$basedir":
+    ensure => directory,
+    mode => $basedir_mode,
+  }
+  file { "$basedir/conf":
+    ensure => directory,
+    mode => '0770',
+  }
+  file { "$basedir/db":
+    ensure => directory,
+    mode => '0770',
+  }
+  file { "$basedir/dists":
+    ensure => directory,
+    mode => '0775',
+  }
+  file { "$basedir/pool":
+    ensure => directory,
+    mode => '0775',
+  }
+  file { "$basedir/incoming":
+    ensure => directory,
+    mode => $incoming_mode,
+  }
+  file { "$basedir/logs":
+    ensure => directory,
+    mode => '0775',
+  }
+  file { "$basedir/tmp":
+    ensure => directory,
+    mode => '0775',
+  }
+  file { "$basedir/conf/uploaders":
+    mode => '0660', owner => root,
+    content => template("reprepro/uploaders.erb"),
+  }
+  file { "$basedir/index.html":
+    mode => '0664', owner => root,
+    content => template("reprepro/index.html.erb"),
+  }
+
+  file { "$basedir/.gnupg":
+    ensure => directory,
+    mode => '0700',
+  }
+  file { "$basedir/.gnupg/secring.gpg":
+    ensure => present,
+    mode => '0600',
+  }
+
+  exec { "/usr/local/bin/reprepro-export-key '$basedir'":
+    creates     => "$basedir/key.asc",
+    user        => reprepro,
+    subscribe   => File["$basedir/.gnupg/secring.gpg"],
+    require     => File["/usr/local/bin/reprepro-export-key"],
+  }
+
+
+  file { "$basedir/conf/distributions":
+    ensure => present,
+  }
+  if $manage_distributions_conf {
+    File["$basedir/conf/distributions"] {
+      owner   => root,
+      mode    => '0664',
+      content => template("reprepro/distributions.erb"),
+    }
+
+    exec { "reprepro -b $basedir createsymlinks":
+        refreshonly => true,
+        subscribe => File["$basedir/conf/distributions"],
+        user => reprepro,
+        path => "/usr/bin:/bin",
+    }
+    exec { "reprepro -b $basedir export":
+        refreshonly => true,
+        user => reprepro,
+        subscribe => File["$basedir/conf/distributions"],
+        path => "/usr/bin:/bin",
+    }
+  }
+
+  file { "$basedir/conf/incoming":
+    ensure => present,
+  }
+  if $manage_incoming_conf {
+    File["$basedir/conf/incoming"] {
+      mode => '0664',
+      owner => root,
+      source => "puppet:///modules/reprepro/incoming"
+    }
+  }
+
+  # Handling of incoming with cron
+
+  $cron_presence = $handle_incoming_with_cron ? {
+    true    => present,
+    default => absent,
+  }
+
+  cron { "reprepro-$name":
+    ensure  => $cron_presence,
+    command => "/usr/bin/reprepro --silent -b $basedir processincoming incoming",
+    user    => reprepro,
+    minute  => '*/5',
+    require => [ Package['reprepro'], File["$basedir/conf/distributions"],
+                 File["$basedir/incoming"], ],
+  }
+
+  # Handling of incoming with inoticoming
+
+  $inoticoming_presence = $handle_incoming_with_inotify ? {
+    true    => present,
+    default => absent,
+  }
+  $inoticoming_enabled = $handle_incoming_with_inotify ? {
+    true    => true,
+    default => false,
+  }
+
+  if $handle_incoming_with_inotify {
+    include reprepro::inotify
+  }
+
+  file { '/etc/init.d/reprepro':
+    ensure => $inoticoming_presence,
+    owner  => root,
+    group  => root,
+    mode   => '0755',
+    source => "puppet:///modules/reprepro/inoticoming.init",
+  }
+  file { '/etc/default/reprepro':
+    ensure  => $inoticoming_presence,
+    owner   => root, group => root, mode => '0755',
+    content => template('reprepro/inoticoming.default.erb'),
+  }
+
+  service { 'reprepro':
+    ensure => $inoticoming_enabled,
+    enable => $inoticoming_enabled,
+    pattern => 'inoticoming.*reprepro.*processincoming',
+    require => [ Package['inoticoming'],
+                 File['/etc/default/reprepro'],
+                 File['/etc/init.d/reprepro'],
+                 File["$basedir/incoming"] ],
+  }
+
+# TODO: setup needeed lines in apache site config file
+
+}
-- 
cgit v1.2.3


From 3e9b70157c4b1ce00cd3ace6eeba682bbc4eaf73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 18:04:27 -0500
Subject: make the user/group customizable per repository

---
 manifests/init.pp       | 15 ---------------
 manifests/repository.pp | 31 +++++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 21a1836..16aa700 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,21 +3,6 @@ class reprepro {
     "reprepro": ensure => 'installed';
   }
 
-  user { "reprepro":
-    ensure => "present",
-    home => "$basedir",
-    gid => "reprepro",
-    password => "*",
-    comment => "reprepro sandbox",
-    require => Group["reprepro"],
-  }
-
-  if !defined(Group["reprepro"]) {
-    group { "reprepro":
-      ensure => present,
-    }
-  }
-
   file { '/usr/local/bin/reprepro-export-key':
     ensure  => present,
     source => "puppet:///modules/reprepro/reprepro-export-key.sh",
diff --git a/manifests/repository.pp b/manifests/repository.pp
index 431093d..20f6711 100644
--- a/manifests/repository.pp
+++ b/manifests/repository.pp
@@ -1,5 +1,7 @@
 define reprepro::repository (
   $uploaders,
+  $user = 'reprepro',
+  $group = 'reprepro',
   $basedir = '/srv/reprepro',
   $origin  = $::domain,
   $architectures  = [ 'amd64', 'i386', 'source' ],
@@ -12,9 +14,26 @@ define reprepro::repository (
 ) {
   include reprepro
 
+  if !defined(User[$user]) {
+    user { $user:
+      ensure => "present",
+      home => "$basedir",
+      gid => $group,
+      password => "*",
+      comment => "reprepro sandbox",
+      require => Group[$group],
+    }
+  }
+
+  if !defined(Group[$group]) {
+    group { $group:
+      ensure => present,
+    }
+  }
+
   File {
-    owner => reprepro,
-    group => reprepro,
+    owner => $user,
+    group => $group,
   }
 
   file { "$basedir":
@@ -69,7 +88,7 @@ define reprepro::repository (
 
   exec { "/usr/local/bin/reprepro-export-key '$basedir'":
     creates     => "$basedir/key.asc",
-    user        => reprepro,
+    user        => $user,
     subscribe   => File["$basedir/.gnupg/secring.gpg"],
     require     => File["/usr/local/bin/reprepro-export-key"],
   }
@@ -88,12 +107,12 @@ define reprepro::repository (
     exec { "reprepro -b $basedir createsymlinks":
         refreshonly => true,
         subscribe => File["$basedir/conf/distributions"],
-        user => reprepro,
+        user => $user,
         path => "/usr/bin:/bin",
     }
     exec { "reprepro -b $basedir export":
         refreshonly => true,
-        user => reprepro,
+        user => $user,
         subscribe => File["$basedir/conf/distributions"],
         path => "/usr/bin:/bin",
     }
@@ -120,7 +139,7 @@ define reprepro::repository (
   cron { "reprepro-$name":
     ensure  => $cron_presence,
     command => "/usr/bin/reprepro --silent -b $basedir processincoming incoming",
-    user    => reprepro,
+    user    => $user,
     minute  => '*/5',
     require => [ Package['reprepro'], File["$basedir/conf/distributions"],
                  File["$basedir/incoming"], ],
-- 
cgit v1.2.3


From a3f2d2f0c169bd0fd18c82cc6804bbe483bb736b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 18:35:13 -0500
Subject: get rid of the inotify class as this was failing if it wasn't used

---
 manifests/inotify.pp    | 5 -----
 manifests/repository.pp | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 manifests/inotify.pp

diff --git a/manifests/inotify.pp b/manifests/inotify.pp
deleted file mode 100644
index 491fb04..0000000
--- a/manifests/inotify.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class reprepro::inotify {
-  package { 'inoticoming':
-    ensure => 'present',
-  }
-}
diff --git a/manifests/repository.pp b/manifests/repository.pp
index 20f6711..317fbdc 100644
--- a/manifests/repository.pp
+++ b/manifests/repository.pp
@@ -160,6 +160,12 @@ define reprepro::repository (
     include reprepro::inotify
   }
 
+  if !defined(Package['inoticoming']) {
+    package { 'inoticoming':
+      ensure => $inoticoming_presence,
+    }
+  }
+
   file { '/etc/init.d/reprepro':
     ensure => $inoticoming_presence,
     owner  => root,
-- 
cgit v1.2.3


From 69e70d1fefe62478d34c5b48d3eadad755bace9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 19:02:11 -0500
Subject: mention multi-repository support

---
 README | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README b/README
index be572c4..595540d 100644
--- a/README
+++ b/README
@@ -21,6 +21,12 @@ Instead of:
 
   class { 'reprepro': origin => 'example.com }
 
+Even more recent versions do not use parametrized classes anymore but
+defines, in order to support multiple repositories. So you should do
+instead:
+
+  reprepro::repository { "default": origin => 'example.com' }
+
 Parameters
 ==========
 
-- 
cgit v1.2.3


From 1f736f3ef6a2e1878c164427e40b94e03b5befa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 19:11:07 -0500
Subject: really remove inotify class

---
 manifests/repository.pp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifests/repository.pp b/manifests/repository.pp
index 317fbdc..83d081e 100644
--- a/manifests/repository.pp
+++ b/manifests/repository.pp
@@ -156,10 +156,6 @@ define reprepro::repository (
     default => false,
   }
 
-  if $handle_incoming_with_inotify {
-    include reprepro::inotify
-  }
-
   if !defined(Package['inoticoming']) {
     package { 'inoticoming':
       ensure => $inoticoming_presence,
-- 
cgit v1.2.3


From a33c09dd96f310e997c2365ebfd23860b65e61f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 19:31:14 -0500
Subject: make sure the user belongs to the right group if we haven't created
 it

---
 manifests/repository.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/repository.pp b/manifests/repository.pp
index 83d081e..5bcf599 100644
--- a/manifests/repository.pp
+++ b/manifests/repository.pp
@@ -14,7 +14,11 @@ define reprepro::repository (
 ) {
   include reprepro
 
-  if !defined(User[$user]) {
+  if defined(User[$user]) {
+    User[$user] {
+      groups +> $group,
+    }
+  } else {
     user { $user:
       ensure => "present",
       home => "$basedir",
-- 
cgit v1.2.3


From 5fd35af26ae715bba17f49f8847bd21bc919ef53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 19:31:25 -0500
Subject: reprepro shouldn't be able to write to uploaders

---
 manifests/repository.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/repository.pp b/manifests/repository.pp
index 5bcf599..e414de8 100644
--- a/manifests/repository.pp
+++ b/manifests/repository.pp
@@ -73,7 +73,7 @@ define reprepro::repository (
     mode => '0775',
   }
   file { "$basedir/conf/uploaders":
-    mode => '0660', owner => root,
+    mode => '0640', owner => root,
     content => template("reprepro/uploaders.erb"),
   }
   file { "$basedir/index.html":
-- 
cgit v1.2.3


From d34ae9f4ee2950566cda0485eb6addfa0e117bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 19:36:16 -0500
Subject: Revert "make sure the user belongs to the right group if we haven't
 created it"

This reverts commit a33c09dd96f310e997c2365ebfd23860b65e61f4.
---
 manifests/repository.pp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/manifests/repository.pp b/manifests/repository.pp
index e414de8..7914048 100644
--- a/manifests/repository.pp
+++ b/manifests/repository.pp
@@ -14,11 +14,7 @@ define reprepro::repository (
 ) {
   include reprepro
 
-  if defined(User[$user]) {
-    User[$user] {
-      groups +> $group,
-    }
-  } else {
+  if !defined(User[$user]) {
     user { $user:
       ensure => "present",
       home => "$basedir",
-- 
cgit v1.2.3


From ef40c3b4c8f7e9405397ccf8ca3f9fb8ace22328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Mon, 7 Jan 2013 19:39:40 -0500
Subject: run the notification daemon as the proper user

---
 templates/inoticoming.default.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3


From a4721486701a23487e6f8028fd32c9b35b10c71c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Tue, 8 Jan 2013 11:13:16 -0500
Subject: remove lenny/oldstable

---
 templates/distributions.erb | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/templates/distributions.erb b/templates/distributions.erb
index bbd863a..a7a7797 100644
--- a/templates/distributions.erb
+++ b/templates/distributions.erb
@@ -1,17 +1,5 @@
 # This file is managed by Puppet. Do not edit, any changes will be overwritten!
 
-Origin: <%= @origin %>
-Label: <%= @origin %>
-Suite: oldstable
-Pull: stable
-Codename: lenny
-Version: 5.0
-Architectures: <%= @architectures.join(' ') %>
-Components: main non-free contrib
-Description: <%= @origin %> specific (or backported) packages
-SignWith: yes
-Uploaders: uploaders
-
 Origin: <%= @origin %>
 Label: <%= @origin %>
 Suite: stable
-- 
cgit v1.2.3


From 4a6f04aa28f925e5354f60d7919a9ec035a50491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Tue, 8 Jan 2013 11:14:49 -0500
Subject: remove distribution codenames

we prefer distribution-agnostic names like stable/testing/unstable by default
---
 files/incoming              | 2 +-
 templates/distributions.erb | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/files/incoming b/files/incoming
index 57c6a5f..874fe1c 100644
--- a/files/incoming
+++ b/files/incoming
@@ -3,5 +3,5 @@
 Name: incoming
 IncomingDir: incoming
 TempDir: tmp
-Allow: oldstable>lenny stable>squeeze testing>wheezy unstable>sid
+Allow: stable testing unstable
 Cleanup: on_deny on_error
diff --git a/templates/distributions.erb b/templates/distributions.erb
index a7a7797..1d3dff7 100644
--- a/templates/distributions.erb
+++ b/templates/distributions.erb
@@ -4,8 +4,7 @@ Origin: <%= @origin %>
 Label: <%= @origin %>
 Suite: stable
 Pull: testing
-Codename: squeeze
-Version: 6.0
+Codename: stable
 Architectures: <%= @architectures.join(' ') %>
 Components: main non-free contrib
 Description: <%= @origin %> specific (or backported) packages
@@ -16,7 +15,7 @@ Origin: <%= @origin %>
 Label: <%= @origin %>
 Suite: testing
 Pull: unstable
-Codename: wheezy
+Codename: testing
 Architectures: <%= @architectures.join(' ') %>
 Components: main non-free contrib
 Description: <%= @origin %> specific (or backported) packages
@@ -26,7 +25,7 @@ Uploaders: uploaders
 Origin: <%= @origin %>
 Label: <%= @origin %>
 Suite: unstable
-Codename: sid
+Codename: unstable
 Architectures: <%= @architectures.join(' ') %>
 Components: main non-free contrib
 Description: <%= @origin %> specific (or backported) packages
-- 
cgit v1.2.3


From d49d2ef054bb1764aa3d374870d6d6557b3234e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Tue, 8 Jan 2013 11:15:13 -0500
Subject: remove descriptions now that policy is looser

---
 templates/distributions.erb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/templates/distributions.erb b/templates/distributions.erb
index 1d3dff7..b58b6ea 100644
--- a/templates/distributions.erb
+++ b/templates/distributions.erb
@@ -7,7 +7,6 @@ Pull: testing
 Codename: stable
 Architectures: <%= @architectures.join(' ') %>
 Components: main non-free contrib
-Description: <%= @origin %> specific (or backported) packages
 SignWith: yes
 Uploaders: uploaders
 
@@ -18,7 +17,6 @@ Pull: unstable
 Codename: testing
 Architectures: <%= @architectures.join(' ') %>
 Components: main non-free contrib
-Description: <%= @origin %> specific (or backported) packages
 SignWith: yes
 Uploaders: uploaders
 
@@ -28,6 +26,5 @@ Suite: unstable
 Codename: unstable
 Architectures: <%= @architectures.join(' ') %>
 Components: main non-free contrib
-Description: <%= @origin %> specific (or backported) packages
 SignWith: yes
 Uploaders: uploaders
-- 
cgit v1.2.3