Fix overly complex location for ssl workdir

This commit is contained in:
Alexandre Aubin 2021-11-22 08:10:14 +01:00
parent 799609c7a8
commit 9c28c07af4
4 changed files with 6 additions and 4 deletions

View file

@ -5,7 +5,7 @@
# This definition stops the following lines choking if HOME isn't
# defined.
HOME = /usr/share/yunohost/yunohost-config/ssl
HOME = /usr/share/yunohost/ssl
RANDFILE = $ENV::HOME/.rnd
# Extra OBJECT IDENTIFIER info:
@ -34,7 +34,7 @@ default_ca = Yunohost # The default ca section
####################################################################
[ Yunohost ]
dir = /usr/share/yunohost/yunohost-config/ssl/yunoCA # Where everything is kept
dir = /usr/share/yunohost/ssl # Where everything is kept
certs = $dir/certs # Where the issued certs are kept
crl_dir = $dir/crl # Where the issued crl are kept
database = $dir/index.txt # database index file.

View file

@ -181,6 +181,8 @@ do_post_regen() {
find /etc/cron.d/yunohost-* -type f -exec chmod 644 {} \;
find /etc/cron.*/yunohost-* -type f -exec chown root:root {} \;
chmod 750 /usr/share/yunohost/ssl
chown root:root /var/cache/yunohost
chmod 700 /var/cache/yunohost
chown root:root /var/cache/moulinette

View file

@ -2,7 +2,7 @@
set -e
ssl_dir="/usr/share/yunohost/yunohost-config/ssl/yunoCA"
ssl_dir="/usr/share/yunohost/ssl"
ynh_ca="/etc/yunohost/certs/yunohost.org/ca.pem"
ynh_crt="/etc/yunohost/certs/yunohost.org/crt.pem"
ynh_key="/etc/yunohost/certs/yunohost.org/key.pem"

View file

@ -54,7 +54,7 @@ WEBROOT_FOLDER = "/tmp/acme-challenge-public/"
SELF_CA_FILE = "/etc/ssl/certs/ca-yunohost_crt.pem"
ACCOUNT_KEY_FILE = "/etc/yunohost/letsencrypt_account.pem"
SSL_DIR = "/usr/share/yunohost/yunohost-config/ssl/yunoCA"
SSL_DIR = "/usr/share/yunohost/ssl"
KEY_SIZE = 3072