Ajout : etc/{gnupg,openssl}/

diff --git a/.gitmodules b/.gitmodules
index 9d13031..3d122df 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,9 @@
 [submodule "sec"]
        path = sec
        url = gpg::rsync:ateliers.heureux-cyclage.org:/sec
+[submodule "lib/tool/openssl"]
+       path = lib/tool/openssl
+       url = git://git.autogeree.net/tool/openssl
+[submodule "lib/tool/gnupg"]
+       path = lib/tool/gnupg
+       url = git://git.autogeree.net/tool/gnupg

diff --git a/etc/gnupg/... b/etc/gnupg/...
new file mode 120000 (symlink)
index 0000000..951b30d
--- /dev/null
+++ b/etc/gnupg/...
@@ -0,0 +1 @@
+../...
\ No newline at end of file

diff --git a/etc/gnupg/configure b/etc/gnupg/configure
new file mode 120000 (symlink)
index 0000000..017b1f6
--- /dev/null
+++ b/etc/gnupg/configure
@@ -0,0 +1 @@
+.../lib/tool/admin/etc/gnupg/configure
\ No newline at end of file

diff --git a/etc/gnupg/options b/etc/gnupg/options
new file mode 120000 (symlink)
index 0000000..e5628ea
--- /dev/null
+++ b/etc/gnupg/options
@@ -0,0 +1 @@
+.../lib/tool/admin/etc/gnupg/options
\ No newline at end of file

diff --git a/etc/gnupg/org/... b/etc/gnupg/org/...
new file mode 120000 (symlink)
index 0000000..951b30d
--- /dev/null
+++ b/etc/gnupg/org/...
@@ -0,0 +1 @@
+../...
\ No newline at end of file

diff --git a/etc/gnupg/org/heureux-cyclage/... b/etc/gnupg/org/heureux-cyclage/...
new file mode 120000 (symlink)
index 0000000..951b30d
--- /dev/null
+++ b/etc/gnupg/org/heureux-cyclage/...
@@ -0,0 +1 @@
+../...
\ No newline at end of file

diff --git a/etc/gnupg/org/heureux-cyclage/admin@/... b/etc/gnupg/org/heureux-cyclage/admin@/...
new file mode 120000 (symlink)
index 0000000..951b30d
--- /dev/null
+++ b/etc/gnupg/org/heureux-cyclage/admin@/...
@@ -0,0 +1 @@
+../...
\ No newline at end of file

diff --git a/etc/gnupg/org/heureux-cyclage/admin@/key.conf.m4 b/etc/gnupg/org/heureux-cyclage/admin@/key.conf.m4
new file mode 100644 (file)
index 0000000..21a0460
--- /dev/null
+++ b/etc/gnupg/org/heureux-cyclage/admin@/key.conf.m4
@@ -0,0 +1,13 @@
+dnl # vim: ft=sh
+Key-Type: RSA
+Key-Length: 4096
+Key-Usage: sign
+Passphrase:shell("$tool"/etc/gnupg/\$openpgp/pass squat.net/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:
+Expire-Date: 10y
+Revoker:
+Subkeys: e s
+

diff --git a/etc/gnupg/org/heureux-cyclage/admin@/key.grip b/etc/gnupg/org/heureux-cyclage/admin@/key.grip
new file mode 100644 (file)
index 0000000..4e2fd5c
--- /dev/null
+++ b/etc/gnupg/org/heureux-cyclage/admin@/key.grip
@@ -0,0 +1 @@
+@admin@squat.net

diff --git a/etc/gnupg/org/heureux-cyclage/log@/... b/etc/gnupg/org/heureux-cyclage/log@/...
new file mode 120000 (symlink)
index 0000000..951b30d
--- /dev/null
+++ b/etc/gnupg/org/heureux-cyclage/log@/...
@@ -0,0 +1 @@
+../...
\ 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
new file mode 100644 (file)
index 0000000..c0e6e79
--- /dev/null
+++ b/etc/gnupg/org/heureux-cyclage/log@/key.conf.m4
@@ -0,0 +1,19 @@
+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@)
+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-Comment: Encrypt Only
+Expire-Date: 0
+Revoker: shell( \
+       key="@admin@squat.net";
+       export gpg="$tool"/gpg;
+       gnupg="$tool"/lib/tool/admin/lib/tool/gnupg;
+       printf "%s:%s sensitive" \
+        $("$gnupg"/key/algo "$key") \
+        $("$gnupg"/key/fpr "$key")
+ )
+Subkeys: e

diff --git a/etc/gnupg/org/heureux-cyclage/log@/key.grip b/etc/gnupg/org/heureux-cyclage/log@/key.grip
new file mode 100644 (file)
index 0000000..6ce88f2
--- /dev/null
+++ b/etc/gnupg/org/heureux-cyclage/log@/key.grip
@@ -0,0 +1 @@
+@log@squat.net

diff --git a/etc/gnupg/org/heureux-cyclage/x509@ b/etc/gnupg/org/heureux-cyclage/x509@
new file mode 120000 (symlink)
index 0000000..1ef18e4
--- /dev/null
+++ b/etc/gnupg/org/heureux-cyclage/x509@
@@ -0,0 +1 @@
+admin@
\ No newline at end of file

diff --git a/etc/gnupg/preset b/etc/gnupg/preset
new file mode 120000 (symlink)
index 0000000..1a98d7f
--- /dev/null
+++ b/etc/gnupg/preset
@@ -0,0 +1 @@
+.../lib/tool/admin/etc/gnupg/preset
\ No newline at end of file

diff --git a/etc/openssl/... b/etc/openssl/...
new file mode 120000 (symlink)
index 0000000..951b30d
--- /dev/null
+++ b/etc/openssl/...
@@ -0,0 +1 @@
+../...
\ No newline at end of file

diff --git a/etc/openssl/org/... b/etc/openssl/org/...
new file mode 120000 (symlink)
index 0000000..951b30d
--- /dev/null
+++ b/etc/openssl/org/...
@@ -0,0 +1 @@
+../...
\ No newline at end of file

diff --git a/etc/openssl/org/heureux-cyclage/... b/etc/openssl/org/heureux-cyclage/...
new file mode 120000 (symlink)
index 0000000..951b30d
--- /dev/null
+++ b/etc/openssl/org/heureux-cyclage/...
@@ -0,0 +1 @@
+../...
\ No newline at end of file

diff --git a/etc/openssl/org/heureux-cyclage/gpg.conf b/etc/openssl/org/heureux-cyclage/gpg.conf
new file mode 100644 (file)
index 0000000..212818d
--- /dev/null
+++ b/etc/openssl/org/heureux-cyclage/gpg.conf
@@ -0,0 +1,2 @@
+--local-user admin@heureux-cyclage.org
+--recipient  admin@heureux-cyclage.org

diff --git a/etc/openssl/org/heureux-cyclage/key/... b/etc/openssl/org/heureux-cyclage/key/...
new file mode 120000 (symlink)
index 0000000..951b30d
--- /dev/null
+++ b/etc/openssl/org/heureux-cyclage/key/...
@@ -0,0 +1 @@
+../...
\ No newline at end of file

diff --git a/etc/openssl/org/heureux-cyclage/key/pass.gpg.preset b/etc/openssl/org/heureux-cyclage/key/pass.gpg.preset
new file mode 120000 (symlink)
index 0000000..37b6cc2
--- /dev/null
+++ b/etc/openssl/org/heureux-cyclage/key/pass.gpg.preset
@@ -0,0 +1 @@
+.../etc/gnupg/org/heureux-cyclage/x509@
\ No newline at end of file

diff --git a/etc/openssl/org/heureux-cyclage/key/pem.gpg.preset b/etc/openssl/org/heureux-cyclage/key/pem.gpg.preset
new file mode 120000 (symlink)
index 0000000..37b6cc2
--- /dev/null
+++ b/etc/openssl/org/heureux-cyclage/key/pem.gpg.preset
@@ -0,0 +1 @@
+.../etc/gnupg/org/heureux-cyclage/x509@
\ No newline at end of file

diff --git a/etc/openssl/org/heureux-cyclage/openssl.conf b/etc/openssl/org/heureux-cyclage/openssl.conf
new file mode 100644 (file)
index 0000000..a312b5a
--- /dev/null
+++ b/etc/openssl/org/heureux-cyclage/openssl.conf
@@ -0,0 +1,24 @@
+# vim: ft=cfg
+[ req ]
+       default_bits       = 4096
+       default_md         = sha512
+       distinguished_name = distinguished_name
+       prompt             = no
+       req_extensions     = extensions
+       utf8               = yes
+[ distinguished_name ]
+       countryName            = FR
+       #stateOrProvinceName    =
+       #localityName           =
+       0.organizationName     = L’Heureux Cyclage
+       organizationalUnitName = public
+       commonName             = *.heureux-cyclage.org
+               # NOTE: wildcard certificate (more expen$ive)
+[ extensions ]
+       basicConstraints       = critical,CA:FALSE
+               # NOTE: this is not a Certificate Authority,
+               #       but only a leaf certificate, and thus
+               #       does not allow user certificates.
+       keyUsage               = keyEncipherment, keyAgreement
+       subjectAltName         = email:admin@heureux-cyclage.org
+       subjectKeyIdentifier   = hash

diff --git a/etc/openssl/org/heureux-cyclage/req/... b/etc/openssl/org/heureux-cyclage/req/...
new file mode 120000 (symlink)
index 0000000..951b30d
--- /dev/null
+++ b/etc/openssl/org/heureux-cyclage/req/...
@@ -0,0 +1 @@
+../...
\ No newline at end of file

diff --git a/etc/openssl/org/heureux-cyclage/req/configure b/etc/openssl/org/heureux-cyclage/req/configure
new file mode 120000 (symlink)
index 0000000..6789db5
--- /dev/null
+++ b/etc/openssl/org/heureux-cyclage/req/configure
@@ -0,0 +1 @@
+.../lib/tool/admin/etc/openssl/$x509/req/configure
\ No newline at end of file

diff --git a/gpg b/gpg
new file mode 120000 (symlink)
index 0000000..e4da946
--- /dev/null
+++ b/gpg
@@ -0,0 +1 @@
+lib/tool/admin/gpg
\ No newline at end of file

diff --git a/lib/tool/admin b/lib/tool/admin
index 2c5bb76..fe52d19 160000 (submodule)
--- a/lib/tool/admin
+++ b/lib/tool/admin
@@ -1 +1 @@
-Subproject commit 2c5bb765f7316493e21a3ab1de57dd1aeed3ea29
+Subproject commit fe52d19a3ba1e585489718263dce92224a902405

diff --git a/mkdir b/mkdir
new file mode 120000 (symlink)
index 0000000..52ce272
--- /dev/null
+++ b/mkdir
@@ -0,0 +1 @@
+lib/tool/admin/mkdir
\ No newline at end of file

diff --git a/sec b/sec
index 2ae82b0..b29147c 160000 (submodule)
--- a/sec
+++ b/sec
@@ -1 +1 @@
-Subproject commit 2ae82b01eddb201e25ab8a3d08a4d00da8b44364
+Subproject commit b29147c06f5a2c59dcf86b0e076fcc1e84567c10

diff --git a/var b/var
new file mode 120000 (symlink)
index 0000000..40da5a0
--- /dev/null
+++ b/var
@@ -0,0 +1 @@
+.../sec/var
\ No newline at end of file

diff --git a/var/... b/var/...
deleted file mode 120000 (symlink)
index 951b30d..0000000
--- a/var/...
+++ /dev/null
@@ -1 +0,0 @@
-../...
\ No newline at end of file