YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Do not increment serial unless YunoHost is postinstalled

Browse source
This commit is contained in:
kload 2015-10-01 18:10:35 -04:00
parent 72e2cbeef9
commit 29b0088ffc
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/hooks/conf_regen/02-ssl
View file

@ -25,6 +25,13 @@ sudo mkdir -p $ssl_dir/{ca,certs,crl,newcerts}
safe_copy openssl.cnf $ssl_dir/openssl.cnf safe_copy openssl.cnf $ssl_dir/openssl.cnf
if [ ! -f /etc/yunohost/installed ]; then
sudo rm -f $ssl_dir/index.txt
sudo touch $ssl_dir/index.txt
sudo rm -f $ssl_dir/serial
sudo rm -f /etc/yunohost/certs/yunohost.org/*
fi
if [ ! -f $ssl_dir/serial ]; then if [ ! -f $ssl_dir/serial ]; then
echo "01" | sudo tee $ssl_dir/serial echo "01" | sudo tee $ssl_dir/serial
fi fi
@ -42,6 +49,10 @@ if [ ! -f /etc/yunohost/certs/yunohost.org/crt.pem ]; then
sudo openssl ca -config $ssl_dir/openssl.cnf \ sudo openssl ca -config $ssl_dir/openssl.cnf \
-days 730 -in $ssl_dir/certs/yunohost_csr.pem \ -days 730 -in $ssl_dir/certs/yunohost_csr.pem \
-out $ssl_dir/certs/yunohost_crt.pem -batch -out $ssl_dir/certs/yunohost_crt.pem -batch
sudo chmod 640 $ssl_dir/certs/yunohost_key.pem
sudo chmod 640 $ssl_dir/newcerts/01.pem
sudo cp $ssl_dir/ca/cacert.pem \ sudo cp $ssl_dir/ca/cacert.pem \
/etc/yunohost/certs/yunohost.org/ca.pem /etc/yunohost/certs/yunohost.org/ca.pem
sudo cp $ssl_dir/certs/yunohost_key.pem \ sudo cp $ssl_dir/certs/yunohost_key.pem \

2
data/hooks/conf_regen/15-nginx
View file

@ -72,6 +72,8 @@ if [ -f /etc/yunohost/installed ]; then
done done
else else
[ ! -f /etc/nginx/sites-available/default ] \
|| rm -f /etc/nginx/sites-enabled/default
need_restart=True need_restart=True
fi fi