diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-13 12:00:39 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-13 12:00:39 -0500 |
| commit | 0e4cd139d4824c7c80598aea553bd493b8f621b8 (patch) | |
| tree | 36d104da9d298d57d7a2c89ddc48868a3354143c | |
| parent | c58c6772a0b3aea6f8e807af9bad3070c0a7ac18 (diff) | |
| parent | 2ec8081667c1f12591e3de5c03942c6f19e7e1bf (diff) | |
Merge branch 'add_signwith' into leap
Conflicts:
templates/distributions.erb
| -rw-r--r-- | manifests/repository.pp | 3 | ||||
| -rw-r--r-- | templates/distributions.erb | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/manifests/repository.pp b/manifests/repository.pp index 07ba6e2..70b9d57 100644 --- a/manifests/repository.pp +++ b/manifests/repository.pp @@ -10,7 +10,8 @@ define reprepro::repository ( $manage_distributions_conf = true, $manage_incoming_conf = true, $handle_incoming_with_cron = false, - $handle_incoming_with_inotify = false + $handle_incoming_with_inotify = false, + $signwith = 'yes' ) { include reprepro diff --git a/templates/distributions.erb b/templates/distributions.erb index 0e98142..1f22aab 100644 --- a/templates/distributions.erb +++ b/templates/distributions.erb @@ -7,6 +7,7 @@ Pull: testing Codename: stable Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib +SignWith: <%= signwith %> Uploaders: uploaders Origin: <%= @origin %> @@ -16,7 +17,7 @@ Pull: unstable Codename: testing Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -SignWith: yes +SignWith: <%= signwith %> Uploaders: uploaders Origin: <%= @origin %> @@ -25,5 +26,5 @@ Suite: unstable Codename: unstable Architectures: <%= @architectures.join(' ') %> Components: main non-free contrib -SignWith: yes +SignWith: <%= signwith %> Uploaders: uploaders |