aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-02-25 23:29:50 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-02-25 23:29:50 +0100
commitd527e9ad55809f37d3107fc89a2210c25627a573 (patch)
treeda0f07932906811956d33a4243ea43f765522876
parentc3c7520b5044e428524103919e7e48a7468cbe7c (diff)
Cleanup
-rw-r--r--acme.conf37
-rw-r--r--acme.toml60
-rw-r--r--cmd/acme/dim13.hcl53
-rw-r--r--cmd/acme/dim13.toml41
-rw-r--r--cmd/acme/docker.hcl43
-rw-r--r--cmd/acme/docker.toml38
-rw-r--r--doc/acme.dot (renamed from acme.dot)0
-rw-r--r--doc/acme.yml (renamed from acme.yaml)0
8 files changed, 0 insertions, 272 deletions
diff --git a/acme.conf b/acme.conf
deleted file mode 100644
index b05faf3..0000000
--- a/acme.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# global settings
-set geracetime 1 week
-listen on lo port 8443
-
-# provider definitions
-provider lev1 https://acme-v01.api.letsencrypt.org/directory
-provider les https://acme-staging.api.letsencrypt.org/directory default
-
-# account definitions
-account webmaster@example.com key /etc/webmaster.key default
-account mailmaster@example.com key /etc/mailmaster.key phone +12025551212
-
-# hook definitions
-hook nginx "doas /etc/rc.d/nginx reload"
-hook dovecot "doas /etc/rc.d/dovecot reload"
-hook smtpd "doas /etc/rc.d/smtpd reload"
-
-# desire definitions
-# full example
-desire { www.example.com, example.com, www2.example.com } from les \
- as webmaster@example.com \
- key /etc/ssl/private/www_example_com.key \
- cert /etc/ssl/cert/www_example_com.pem \
- webroot /var/www/htdocs \
- hook nginx
-
-# desire with prefix www implies altname without www
-# short example, with default provider and account
-desire www.example.net \
- key /etc/ssl/private/www_example_net.key \
- cert /etc/ssl/cert/www_example_net.pem
-
-desire mail.example.com from les \
- as mailmaster@example.com \
- key /etc/ssl/private/mail_example_com.key \
- cert /etc/ssl/cert/mail_example_com.pem \
- hook { dovecot, smtpd }
diff --git a/acme.toml b/acme.toml
deleted file mode 100644
index 222e474..0000000
--- a/acme.toml
+++ /dev/null
@@ -1,60 +0,0 @@
-[defaults]
-gracetime = "168h" # 1 week
-listen = "localhost:8443"
-basedir = ".acme" # usually "/etc/ssl"
-provider = "les"
-account = "webmaster"
-keysize = 2048 # default key size
-
-#[provider.lev1]
-#directory = "https://acme-v01.api.letsencrypt.org/directory"
-
-[provider.les]
-directory = "https://acme-staging.api.letsencrypt.org/directory"
-
-[account.webmaster]
-mail = "webmaster@example.com"
-key = "private/webmaster.key"
-
-#[account.postmaster]
-#mail = "postmaster@example.com"
-#phone = "+12025551212"
-#key = "private/postmaster.key"
-
-#[account.notused]
-#mail = "notused@example.com"
-#key = "private/notused.key"
-
-[hook.nginx]
-cmd = "sudo service nginx reload"
-
-#[hook.dovecot]
-#cmd = "sudo service dovecot reload"
-
-#[hook.smtpd]
-#cmd = "sudo service smtpd reload"
-
-# long example
-[desire.com]
-provider = "les"
-account = "webmaster"
-altnames = [ "www.example.com", "example.com" ]
-key = "private/www_example_com.key"
-cert = "certs/www_example_com.pem"
-webroot = "/var/www/htdocs"
-hooks = [ "nginx" ]
-
-# short example, uses defaults
-#[desire.net]
-#altnames = [ "www.example.net" ] # www implies altname without www
-#key = "private/www_example_net.key"
-#cert = "certs/www_example_net.pem"
-#hooks = [ "nginx" ]
-
-#[desire.mail]
-#provider = "les"
-#account = "postmaster"
-#altnames = [ "mail.example.com" ]
-#key = "private/mail_example_com.key"
-#cert = "certs/mail_example_com.pem"
-#hooks = [ "dovecot", "smtpd" ]
diff --git a/cmd/acme/dim13.hcl b/cmd/acme/dim13.hcl
deleted file mode 100644
index 71295dd..0000000
--- a/cmd/acme/dim13.hcl
+++ /dev/null
@@ -1,53 +0,0 @@
-defaults {
- listen = "localhost:8080"
- listentls = "localhost:8443"
- basedir = "~/.acme"
- keysize = 2048
-}
-
-provider "letsencrypt" {
- directory = "https://acme-v01.api.letsencrypt.org/directory"
-}
-
-provider "letsencrypt-staging" {
- directory = "https://acme-staging.api.letsencrypt.org/directory"
-}
-
-account "webmaster" {
- mail = "webmaster@dim13.org"
- key = "private/webmaster.key"
-}
-
-account "postmaster" {
- mail = "postmaster@dim13.org"
- key = "private/postmaster.key"
-}
-
-desire "web" {
- provider = "letsencrypt"
- account = "webmaster"
- key = "private/www_dim13_org.key"
- cert = "certs/www_dim13_org.pem"
-
- altnames = [
- "www.dim13.org",
- "mail.dim13.org",
- "git.dim13.org",
- "cvs.dim13.org",
- "dim13.org",
- ]
-}
-
-desire "mail" {
- provider = "letsencrypt"
- account = "postmaster"
- key = "private/mail_dim13_org.key"
- cert = "certs/mail_dim13_org.pem"
-
- altnames = [
- "mail.dim13.org",
- "smtp.dim13.org",
- "imap.dim13.org",
- "dim13.org",
- ]
-}
diff --git a/cmd/acme/dim13.toml b/cmd/acme/dim13.toml
deleted file mode 100644
index 32446f4..0000000
--- a/cmd/acme/dim13.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[defaults]
-listen = "localhost:8080"
-listentls = "localhost:8443"
-basedir = "/home/demon/.acme"
-keysize = 2048
-
-[provider.letsencrypt]
-directory = "https://acme-v01.api.letsencrypt.org/directory"
-
-[account.webmaster]
-mail = "webmaster@dim13.org"
-key = "private/webmaster.key"
-
-[account.postmaster]
-mail = "postmaster@dim13.org"
-key = "private/postmaster.key"
-
-[desire.web]
-provider = "letsencrypt"
-account = "webmaster"
-altnames = [
- "www.dim13.org",
- "mail.dim13.org",
- "git.dim13.org",
- "cvs.dim13.org",
- "dim13.org"
-]
-key = "private/www_dim13_org.key"
-cert = "certs/www_dim13_org.pem"
-
-[desire.mail]
-provider = "letsencrypt"
-account = "postmaster"
-altnames = [
- "mail.dim13.org",
- "smtp.dim13.org",
- "imap.dim13.org",
- "dim13.org"
-]
-key = "private/mail_dim13_org.key"
-cert = "certs/mail_dim13_org.pem"
diff --git a/cmd/acme/docker.hcl b/cmd/acme/docker.hcl
deleted file mode 100644
index 80aca40..0000000
--- a/cmd/acme/docker.hcl
+++ /dev/null
@@ -1,43 +0,0 @@
-defaults {
- gracetime = "168h" # 1 week
- listen = "localhost:8080"
- listentls = "localhost:8443"
- basedir = ".acme" # usually "/etc/ssl"
- provider = "les"
- account = "webmaster"
- keysize = 2048 # default key size
-}
-
-provider "staging" {
- directory = "https://acme-staging.api.letsencrypt.org/directory"
-}
-
-account "webmaster" {
- mail = "webmaster@docker.moccu.com"
- key = "private/webmaster.key"
-}
-
-account "webmaster2" {
- mail = "webmaster@docker.moccu.com"
- key = "private/webmaster2.key"
-}
-
-desire "docker" {
- provider = "staging"
- account = "webmaster"
- altnames = ["docker.moccu.com", "test.docker.moccu.com"]
- key = "private/docker_moccu_com.key"
- cert = "certs/docker_moccu_com.pem"
-}
-
-desire "www" {
- provider = "staging"
- account = "webmaster2"
- altnames = ["www.docker.moccu.com"]
- key = "private/www_docker_moccu_com.key"
- cert = "certs/www_docker_moccu_com.pem"
-}
-
-hook "nginx" {
- cmd = "sudo service nginx reload"
-}
diff --git a/cmd/acme/docker.toml b/cmd/acme/docker.toml
deleted file mode 100644
index eb31816..0000000
--- a/cmd/acme/docker.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-[defaults]
-gracetime = "168h" # 1 week
-listen = "localhost:8080"
-listentls = "localhost:8443"
-basedir = ".acme" # usually "/etc/ssl"
-provider = "les"
-account = "webmaster"
-keysize = 2048 # default key size
-
-[provider.les]
-directory = "https://acme-staging.api.letsencrypt.org/directory"
-
-[account.webmaster]
-mail = "webmaster@docker.moccu.com"
-key = "private/webmaster.key"
-
-[account.webmaster2]
-mail = "webmaster@docker.moccu.com"
-key = "private/webmaster2.key"
-
-[desire.docker]
-provider = "les"
-account = "webmaster"
-altnames = [ "docker.moccu.com", "test.docker.moccu.com" ]
-key = "private/docker_moccu_com.key"
-cert = "certs/docker_moccu_com.pem"
-#webroot = "/var/www/htdocs"
-#hooks = [ "nginx" ]
-
-[desire.www]
-provider = "les"
-account = "webmaster2"
-altnames = [ "www.docker.moccu.com" ]
-key = "private/www_docker_moccu_com.key"
-cert = "certs/www_docker_moccu_com.pem"
-
-[hook.nginx]
-cmd = "sudo service nginx reload"
diff --git a/acme.dot b/doc/acme.dot
index 78aeb12..78aeb12 100644
--- a/acme.dot
+++ b/doc/acme.dot
diff --git a/acme.yaml b/doc/acme.yml
index 3ef172e..3ef172e 100644
--- a/acme.yaml
+++ b/doc/acme.yml