Explorar el Código

irc uses default domain certificate

Bob Mottram hace 8 años
padre
commit
40e9dfe838
Se han modificado 1 ficheros con 14 adiciones y 4 borrados
  1. 14
    4
      src/freedombone-app-irc

+ 14
- 4
src/freedombone-app-irc Ver fichero

365
         exit 53
365
         exit 53
366
     fi
366
     fi
367
 
367
 
368
-    if [ ! -f /etc/ssl/certs/ngircd.dhparam ]; then
368
+    # obtain a cert for the default domain
369
+    if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "0" ]]; then
370
+        echo $'Obtaining certificate for the main domain'
371
+        create_site_certificate ${DEFAULT_DOMAIN_NAME} 'yes'
372
+    fi
373
+
374
+    if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME}) == "0" ]]; then
369
         ${PROJECT_NAME}-addcert -h ngircd --dhkey ${DH_KEYLENGTH}
375
         ${PROJECT_NAME}-addcert -h ngircd --dhkey ${DH_KEYLENGTH}
370
         function_check check_certificates
376
         function_check check_certificates
371
         check_certificates ngircd
377
         check_certificates ngircd
388
     sed -i "s/irc.example.net/$DEFAULTDOMAIN/g" /etc/ngircd/ngircd.conf
394
     sed -i "s/irc.example.net/$DEFAULTDOMAIN/g" /etc/ngircd/ngircd.conf
389
     sed -i "s|Yet another IRC Server running on Debian GNU/Linux|IRC Server of $DEFAULTDOMAIN|g" /etc/ngircd/ngircd.conf
395
     sed -i "s|Yet another IRC Server running on Debian GNU/Linux|IRC Server of $DEFAULTDOMAIN|g" /etc/ngircd/ngircd.conf
390
     sed -i 's/;Password = wealllikedebian/Password =/g' /etc/ngircd/ngircd.conf
396
     sed -i 's/;Password = wealllikedebian/Password =/g' /etc/ngircd/ngircd.conf
391
-    sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf
392
-    sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
393
-    sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
397
+    if [ -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
398
+        sed -i "s|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/ngircd/ngircd.conf
399
+    else
400
+        sed -i "s|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt|g" /etc/ngircd/ngircd.conf
401
+    fi
402
+    sed -i "s|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam|g" /etc/ngircd/ngircd.conf
403
+    sed -i "s|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/ngircd/ngircd.conf
394
     sed -i "s/;Ports =.*/Ports = ${IRC_PORT}/1" /etc/ngircd/ngircd.conf
404
     sed -i "s/;Ports =.*/Ports = ${IRC_PORT}/1" /etc/ngircd/ngircd.conf
395
     sed -i "s/;Ports =.*/Ports = ${IRC_PORT}/2" /etc/ngircd/ngircd.conf
405
     sed -i "s/;Ports =.*/Ports = ${IRC_PORT}/2" /etc/ngircd/ngircd.conf
396
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
406
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf