From b7969beabccd012122de321bcaf6e6d84060b954 Mon Sep 17 00:00:00 2001 From: Valentin Gologuzov Date: Tue, 25 Nov 2014 18:51:28 +0100 Subject: [PATCH] [copr] backend: new options in /etc/copr/copr-be.conf --- inventory/group_vars/copr-back | 3 +++ inventory/group_vars/copr-back-stg | 3 +++ roles/copr/backend/templates/copr-be.conf | 6 +++++- roles/copr/backend/templates/copr-be.conf-dev | 6 +++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/copr-back b/inventory/group_vars/copr-back index c4171e9c3c..084d69ff63 100644 --- a/inventory/group_vars/copr-back +++ b/inventory/group_vars/copr-back @@ -1,3 +1,6 @@ --- _lighttpd_conf_src: "lighttpd/lighttpd.conf" _copr_be_conf: "copr-be.conf" + +do_sign: "false" +keygen_host: "copr-keygen.cloud.fedoraproject.org" diff --git a/inventory/group_vars/copr-back-stg b/inventory/group_vars/copr-back-stg index bbf370626f..abb368e890 100644 --- a/inventory/group_vars/copr-back-stg +++ b/inventory/group_vars/copr-back-stg @@ -1,3 +1,6 @@ --- _lighttpd_conf_src: "lighttpd/lighttpd_dev.conf" _copr_be_conf: "copr-be.conf-dev" + +do_sign: "true" +keygen_host: "209.132.184.124" diff --git a/roles/copr/backend/templates/copr-be.conf b/roles/copr/backend/templates/copr-be.conf index b065947290..0fb49c3488 100644 --- a/roles/copr/backend/templates/copr-be.conf +++ b/roles/copr/backend/templates/copr-be.conf @@ -64,7 +64,11 @@ fedmsg_enabled=true # enable package signing, require configured # signer host and correct /etc/sign.conf -do_sign=false +do_sign={{ do_sign }} + +# host or ip of machine with copr-keygen +# usually the same as in /etc/sign.conf +keygen_host={{ keygen_host }} # minimum age for builds to be pruned prune_days=14 diff --git a/roles/copr/backend/templates/copr-be.conf-dev b/roles/copr/backend/templates/copr-be.conf-dev index 18392ad80a..6db076fabd 100644 --- a/roles/copr/backend/templates/copr-be.conf-dev +++ b/roles/copr/backend/templates/copr-be.conf-dev @@ -63,7 +63,11 @@ worker_logdir=/var/log/copr/workers/ # enable package signing, require configured # signer host and correct /etc/sign.conf -do_sign=true +do_sign={{ do_sign }} + +# host or ip of machine with copr-keygen +# usually the same as in /etc/sign.conf +keygen_host={{ keygen_host }} # minimum age for builds to be pruned prune_days=14