library/roles: Fix all the letsencrypt hook script. We need to use the FQDN hostname.

This commit is contained in:
Andrea Dell'Amico 2016-06-23 14:05:11 +02:00
parent 874ada60eb
commit 293b71f036
6 changed files with 8 additions and 6 deletions

View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks
LE_CERTS_DIR=/var/lib/acme/live/$HOSTNAME
LE_LOG_DIR=/var/log/letsencrypt LE_LOG_DIR=/var/log/letsencrypt
DATE=$( date ) DATE=$( date )

View File

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
H_NAME=$( hostname -f )
LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks
LE_CERTS_DIR=/var/lib/acme/live/$HOSTNAME LE_CERTS_DIR=/var/lib/acme/live/$H_NAME
LE_LOG_DIR=/var/log/letsencrypt LE_LOG_DIR=/var/log/letsencrypt
HAPROXY_CERTDIR=/etc/pki/haproxy HAPROXY_CERTDIR=/etc/pki/haproxy
HAPROXY_CERTFILE=$HAPROXY_CERTDIR/haproxy.pem HAPROXY_CERTFILE=$HAPROXY_CERTDIR/haproxy.pem

View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks
LE_CERTS_DIR=/var/lib/acme/live/$HOSTNAME
LE_LOG_DIR=/var/log/letsencrypt LE_LOG_DIR=/var/log/letsencrypt
DATE=$( date ) DATE=$( date )

View File

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
H_NAME=$( hostname -f )
LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks
LE_CERTS_DIR=/var/lib/acme/live/$HOSTNAME LE_CERTS_DIR=/var/lib/acme/live/$H_NAME
LE_LOG_DIR=/var/log/acme LE_LOG_DIR=/var/log/acme
OPENLDAP_CERTDIR=/etc/pki/openldap OPENLDAP_CERTDIR=/etc/pki/openldap
DATE=$( date ) DATE=$( date )

View File

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
H_NAME=$( hostname -f )
LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks
LE_CERTS_DIR=/var/lib/acme/live/$HOSTNAME LE_CERTS_DIR=/var/lib/acme/live/$H_NAME
LE_LOG_DIR=/var/log/letsencrypt LE_LOG_DIR=/var/log/letsencrypt
DATE=$( date ) DATE=$( date )

View File

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
H_NAME=$( hostname -f )
LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks LE_SERVICES_SCRIPT_DIR=/usr/lib/acme/hooks
LE_CERTS_DIR=/var/lib/acme/live/$HOSTNAME LE_CERTS_DIR=/var/lib/acme/live/$H_NAME
LE_LOG_DIR=/var/log/letsencrypt LE_LOG_DIR=/var/log/letsencrypt
POSTGRESQL_CERTDIR=/etc/pki/postgresql POSTGRESQL_CERTDIR=/etc/pki/postgresql
POSTGRESQL_KEYFILE=$POSTGRESQL_CERTDIR/postgresql.key POSTGRESQL_KEYFILE=$POSTGRESQL_CERTDIR/postgresql.key