diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/.gitignore | 1 | ||||
| -rwxr-xr-x | conf/default.conf | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/conf/.gitignore b/conf/.gitignore index f21e1b2..9eef7aa 100644 --- a/conf/.gitignore +++ b/conf/.gitignore @@ -1 +1,2 @@ local.conf +admin-gpg-keys diff --git a/conf/default.conf b/conf/default.conf index f9bf2ea..34c5c3e 100755 --- a/conf/default.conf +++ b/conf/default.conf @@ -34,6 +34,12 @@ max_parallel_build_per_client=2 repo_key='0xdeadbeef' package_key='0x15eebadc0de' +if [ -s "${base_dir}/conf/admin-gpg-keys" ]; then + admin_gpg_keys=$( + sed 's|\s*#.*$||' "${base_dir}/conf/admin-gpg-keys" + ) +fi + # to access the master mirror via rsync master_mirror_rsync_command='rsync --password-file=/home/slave/rsync.password' master_mirror_rsync_directory='rsync://buildmaster@mirror.archlinux32.org/packages32' |