summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Smirnov <urpylka@gmail.com>2018-09-15 20:41:14 +0300
committerArtem Smirnov <urpylka@gmail.com>2018-09-15 20:41:14 +0300
commitac1f27ff09b1c699985378cf254274ea8cc50948 (patch)
tree971efa56bca5e137324768fb4cd6c5ed3c31dbfe
parent0deaa906eacdea986810096890099f04f94f77e8 (diff)
parent46dda7b9bd1d7f02b6f4795c63590bfe55d31a5f (diff)
Merge branch 'opt_gpg'
-rwxr-xr-xassets/gpg_batch.sh2
-rwxr-xr-xassets/startup.sh5
2 files changed, 5 insertions, 2 deletions
diff --git a/assets/gpg_batch.sh b/assets/gpg_batch.sh
index 0b66d88..e2b062c 100755
--- a/assets/gpg_batch.sh
+++ b/assets/gpg_batch.sh
@@ -14,6 +14,8 @@ Name-Comment: Aptly Repo Signing
14Name-Email: ${EMAIL_ADDRESS} 14Name-Email: ${EMAIL_ADDRESS}
15Expire-Date: 0 15Expire-Date: 0
16Passphrase: ${GPG_PASSWORD} 16Passphrase: ${GPG_PASSWORD}
17%pubring /opt/aptly/aptly.pub
18%secring /opt/aptly/aptly.sec
17%commit 19%commit
18%echo done 20%echo done
19EOF 21EOF
diff --git a/assets/startup.sh b/assets/startup.sh
index 22888b5..0ab55b6 100755
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -1,6 +1,7 @@
1#! /usr/bin/env bash 1#! /usr/bin/env bash
2 2
3# Copyright 2018 Artem B. Smirnov 3# Copyright 2018 Artem B. Smirnov
4# Copyright 2018 Jon Azpiazu
4# Copyright 2016 Bryan J. Hong 5# Copyright 2016 Bryan J. Hong
5# Licensed under the Apache License, Version 2.0 6# Licensed under the Apache License, Version 2.0
6 7
@@ -49,8 +50,8 @@ if [[ -f /usr/share/keyrings/debian-archive-keyring.gpg ]]; then
49fi 50fi
50 51
51# Aptly looks in /root/.gnupg for default keyrings 52# Aptly looks in /root/.gnupg for default keyrings
52ln -sf /root/.gnupg/secring.gpg /opt/aptly/aptly.sec 53ln -sf /opt/aptly/aptly.sec /root/.gnupg/secring.gpg
53ln -sf /root/.gnupg/pubring.gpg /opt/aptly/aptly.pub 54ln -sf /opt/aptly/aptly.pub /root/.gnupg/pubring.gpg
54 55
55# Generate Nginx Config 56# Generate Nginx Config
56/opt/nginx.conf.sh 57/opt/nginx.conf.sh