From a464821ebae8dc813ef5f2094a3d5dae5b12a0d7 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 13 Mar 2015 15:02:27 +0100 Subject: [PATCH] Ajout : et/gnupg/ --- etc/gnupg/org/heureux-cyclage/admin@/key.conf.m4 | 10 +++++----- etc/gnupg/org/heureux-cyclage/admin@/key.grip | 2 +- etc/gnupg/org/heureux-cyclage/admin@/key.pass.gpg | 1 + etc/gnupg/org/heureux-cyclage/log@/key.conf.m4 | 8 ++++---- etc/gnupg/org/heureux-cyclage/log@/key.grip | 2 +- lib/tool/admin | 2 +- sec | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) create mode 120000 etc/gnupg/org/heureux-cyclage/admin@/key.pass.gpg diff --git a/etc/gnupg/org/heureux-cyclage/admin@/key.conf.m4 b/etc/gnupg/org/heureux-cyclage/admin@/key.conf.m4 index 21a0460..9798dfb 100644 --- a/etc/gnupg/org/heureux-cyclage/admin@/key.conf.m4 +++ b/etc/gnupg/org/heureux-cyclage/admin@/key.conf.m4 @@ -2,12 +2,12 @@ dnl # vim: ft=sh Key-Type: RSA Key-Length: 4096 Key-Usage: sign -Passphrase:shell("$tool"/etc/gnupg/\$openpgp/pass squat.net/admin@) +Passphrase:shell("$tool"/etc/gnupg/\$openpgp/pass org/heureux-cyclage/admin@) Preferences: TWOFISH BLOWFISH AES256 CAST5 CAMELLIA256 3DES SHA512 SHA384 SHA256 SHA224 SHA1 BZIP2 ZLIB ZIP NONE MDC NO-KS-MODIFY -Name-Real: squat!net -Name-Email: admin@squat.net -Name-Comment: +Name-Real: L’Heureux Cyclage +Name-Email: admin@heureux-cyclage.org +dnl Name-Comment: Expire-Date: 10y -Revoker: +dnl Revoker: Subkeys: e s diff --git a/etc/gnupg/org/heureux-cyclage/admin@/key.grip b/etc/gnupg/org/heureux-cyclage/admin@/key.grip index 4e2fd5c..29dbdd6 100644 --- a/etc/gnupg/org/heureux-cyclage/admin@/key.grip +++ b/etc/gnupg/org/heureux-cyclage/admin@/key.grip @@ -1 +1 @@ -@admin@squat.net +@admin@heureux-cyclage.org diff --git a/etc/gnupg/org/heureux-cyclage/admin@/key.pass.gpg b/etc/gnupg/org/heureux-cyclage/admin@/key.pass.gpg new file mode 120000 index 0000000..751fa32 --- /dev/null +++ b/etc/gnupg/org/heureux-cyclage/admin@/key.pass.gpg @@ -0,0 +1 @@ +.../var/openpgp/org/heureux-cyclage/admin@/key.pass.gpg \ No newline at end of file diff --git a/etc/gnupg/org/heureux-cyclage/log@/key.conf.m4 b/etc/gnupg/org/heureux-cyclage/log@/key.conf.m4 index c0e6e79..b570220 100644 --- a/etc/gnupg/org/heureux-cyclage/log@/key.conf.m4 +++ b/etc/gnupg/org/heureux-cyclage/log@/key.conf.m4 @@ -2,14 +2,14 @@ dnl # vim: ft=sh Key-Type: RSA Key-Length: 4096 Key-Usage: sign -Passphrase:shell("$tool"/etc/gnupg/\$openpgp/pass squat.net/log@ squat.net/admin@) +Passphrase:shell("$tool"/etc/gnupg/\$openpgp/pass org/heureux-cyclage/log@) Preferences: TWOFISH BLOWFISH AES256 CAST5 CAMELLIA256 3DES SHA512 SHA384 SHA256 SHA224 SHA1 BZIP2 ZLIB ZIP NONE MDC NO-KS-MODIFY -Name-Real: squat!net log -Name-Email: log@squat.net +Name-Real: Logs de L’Heureux Cyclage +Name-Email: log@heureux-cyclage.org Name-Comment: Encrypt Only Expire-Date: 0 Revoker: shell( \ - key="@admin@squat.net"; + key="@admin@heureux-cyclage.org"; export gpg="$tool"/gpg; gnupg="$tool"/lib/tool/admin/lib/tool/gnupg; printf "%s:%s sensitive" \ diff --git a/etc/gnupg/org/heureux-cyclage/log@/key.grip b/etc/gnupg/org/heureux-cyclage/log@/key.grip index 6ce88f2..2017fe4 100644 --- a/etc/gnupg/org/heureux-cyclage/log@/key.grip +++ b/etc/gnupg/org/heureux-cyclage/log@/key.grip @@ -1 +1 @@ -@log@squat.net +@log@heureux-cyclage.org diff --git a/lib/tool/admin b/lib/tool/admin index fe52d19..a0521cc 160000 --- a/lib/tool/admin +++ b/lib/tool/admin @@ -1 +1 @@ -Subproject commit fe52d19a3ba1e585489718263dce92224a902405 +Subproject commit a0521cc4aec6b83d938f79b0fd2d6f16ad7fe5c5 diff --git a/sec b/sec index b29147c..495ee0c 160000 --- a/sec +++ b/sec @@ -1 +1 @@ -Subproject commit b29147c06f5a2c59dcf86b0e076fcc1e84567c10 +Subproject commit 495ee0cf7b02e15a89847aabcc325dc1cefde85c -- 2.20.1