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] begin serial at 00 for SSL cert generation

Browse source
This commit is contained in:
kload 2015-10-02 23:34:05 +02:00
parent 898620e59d
commit 0e76b82360
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ 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
[ -f $ssl_dir/serial ] \ [ -f $ssl_dir/serial ] \
|| (echo "01" | sudo tee $ssl_dir/serial) || (echo "00" | sudo tee $ssl_dir/serial)
[ -f $ssl_dir/index.txt ] \ [ -f $ssl_dir/index.txt ] \
|| sudo touch $ssl_dir/index.txt || sudo touch $ssl_dir/index.txt

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

@ -36,12 +36,6 @@ done
if [ -f /etc/yunohost/installed ]; then if [ -f /etc/yunohost/installed ]; then
# Copy 'yunohost.local' to the main domain conf directory
main_domain=$(cat /etc/yunohost/current_host)
safe_copy yunohost_local.conf \
/etc/nginx/conf.d/$main_domain.d/yunohost_local.conf
need_restart=False need_restart=False
domain_list=$(sudo yunohost domain list --plain) domain_list=$(sudo yunohost domain list --plain)
@ -61,6 +55,12 @@ if [ -f /etc/yunohost/installed ]; then
done done
# Copy 'yunohost.local' to the main domain conf directory
main_domain=$(cat /etc/yunohost/current_host)
safe_copy yunohost_local.conf \
/etc/nginx/conf.d/$main_domain.d/yunohost_local.conf
# Remove old domains files # Remove old domains files
for file in /etc/nginx/conf.d/*.*.conf; do for file in /etc/nginx/conf.d/*.*.conf; do
domain=$(echo $file \ domain=$(echo $file \