Browse Source

Merge branch 'opt_gpg'

Artem Smirnov 7 months ago
parent
commit
ac1f27ff09
2 changed files with 5 additions and 2 deletions
  1. 2
    0
      assets/gpg_batch.sh
  2. 3
    2
      assets/startup.sh

+ 2
- 0
assets/gpg_batch.sh View File

@@ -14,6 +14,8 @@ Name-Comment: Aptly Repo Signing
14 14
 Name-Email: ${EMAIL_ADDRESS}
15 15
 Expire-Date: 0
16 16
 Passphrase: ${GPG_PASSWORD}
17
+%pubring /opt/aptly/aptly.pub
18
+%secring /opt/aptly/aptly.sec 
17 19
 %commit
18 20
 %echo done
19 21
 EOF

+ 3
- 2
assets/startup.sh View File

@@ -1,6 +1,7 @@
1 1
 #! /usr/bin/env bash
2 2
 
3 3
 # Copyright 2018 Artem B. Smirnov
4
+# Copyright 2018 Jon Azpiazu
4 5
 # Copyright 2016 Bryan J. Hong
5 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
49 50
 fi
50 51
 
51 52
 # Aptly looks in /root/.gnupg for default keyrings
52
-ln -sf /root/.gnupg/secring.gpg /opt/aptly/aptly.sec
53
-ln -sf /root/.gnupg/pubring.gpg /opt/aptly/aptly.pub 
53
+ln -sf /opt/aptly/aptly.sec /root/.gnupg/secring.gpg
54
+ln -sf /opt/aptly/aptly.pub /root/.gnupg/pubring.gpg
54 55
 
55 56
 # Generate Nginx Config
56 57
 /opt/nginx.conf.sh

Loading…
Cancel
Save