Bob Mottram 8 years ago
parent
commit
a1de6ba0c8
4 changed files with 19 additions and 19 deletions
  1. 2
    2
      src/freedombone-app-irc
  2. 5
    5
      src/freedombone-app-xmpp
  3. 5
    5
      src/freedombone-base-email
  4. 7
    7
      src/freedombone-utils-web

+ 2
- 2
src/freedombone-app-irc View File

482
     fi
482
     fi
483
 
483
 
484
     # obtain a cert for the default domain
484
     # obtain a cert for the default domain
485
-    if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "0" ]]; then
485
+    if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "0" ]]; then
486
         echo $'Obtaining certificate for the main domain'
486
         echo $'Obtaining certificate for the main domain'
487
         create_site_certificate ${DEFAULT_DOMAIN_NAME} 'yes'
487
         create_site_certificate ${DEFAULT_DOMAIN_NAME} 'yes'
488
     fi
488
     fi
489
 
489
 
490
-    if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME}) == "0" ]]; then
490
+    if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME})" == "0" ]]; then
491
         ${PROJECT_NAME}-addcert -h ngircd --dhkey ${DH_KEYLENGTH}
491
         ${PROJECT_NAME}-addcert -h ngircd --dhkey ${DH_KEYLENGTH}
492
         function_check check_certificates
492
         function_check check_certificates
493
         check_certificates ngircd
493
         check_certificates ngircd

+ 5
- 5
src/freedombone-app-xmpp View File

315
 
315
 
316
     if [[ $ONION_ONLY == 'no' ]]; then
316
     if [[ $ONION_ONLY == 'no' ]]; then
317
         # obtain a cert for the default domain
317
         # obtain a cert for the default domain
318
-        if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "0" ]]; then
318
+        if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "0" ]]; then
319
             echo $'Obtaining certificate for the main domain'
319
             echo $'Obtaining certificate for the main domain'
320
             create_site_certificate ${DEFAULT_DOMAIN_NAME} 'yes'
320
             create_site_certificate ${DEFAULT_DOMAIN_NAME} 'yes'
321
         fi
321
         fi
345
     fi
345
     fi
346
 
346
 
347
     # create a certificate
347
     # create a certificate
348
-    if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "0" ]]; then
349
-        if [[ $(cert_exists xmpp) == "0" ]]; then
348
+    if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "0" ]]; then
349
+        if [[ "$(cert_exists xmpp)" == "0" ]]; then
350
             ${PROJECT_NAME}-addcert -h xmpp --dhkey ${DH_KEYLENGTH}
350
             ${PROJECT_NAME}-addcert -h xmpp --dhkey ${DH_KEYLENGTH}
351
             check_certificates xmpp
351
             check_certificates xmpp
352
         fi
352
         fi
362
 
362
 
363
     cp -a /etc/prosody/conf.avail/example.com.cfg.lua /etc/prosody/conf.avail/xmpp.cfg.lua
363
     cp -a /etc/prosody/conf.avail/example.com.cfg.lua /etc/prosody/conf.avail/xmpp.cfg.lua
364
 
364
 
365
-    if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
365
+    if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
366
         sed -i "s|/etc/prosody/certs/example.com.key|/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/conf.avail/xmpp.cfg.lua
366
         sed -i "s|/etc/prosody/certs/example.com.key|/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/conf.avail/xmpp.cfg.lua
367
         sed -i "s|/etc/prosody/certs/example.com.crt|/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/conf.avail/xmpp.cfg.lua
367
         sed -i "s|/etc/prosody/certs/example.com.crt|/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/conf.avail/xmpp.cfg.lua
368
     else
368
     else
370
         sed -i 's|/etc/prosody/certs/example.com.crt|/etc/prosody/certs/xmpp.crt|g' /etc/prosody/conf.avail/xmpp.cfg.lua
370
         sed -i 's|/etc/prosody/certs/example.com.crt|/etc/prosody/certs/xmpp.crt|g' /etc/prosody/conf.avail/xmpp.cfg.lua
371
     fi
371
     fi
372
     if ! grep -q "xmpp.dhparam" /etc/prosody/conf.avail/xmpp.cfg.lua; then
372
     if ! grep -q "xmpp.dhparam" /etc/prosody/conf.avail/xmpp.cfg.lua; then
373
-        if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME}) == "1" ]]; then
373
+        if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME})" == "1" ]]; then
374
             sed -i "/certificate =/a\        dhparam = \"/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" /etc/prosody/conf.avail/xmpp.cfg.lua
374
             sed -i "/certificate =/a\        dhparam = \"/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" /etc/prosody/conf.avail/xmpp.cfg.lua
375
         else
375
         else
376
             sed -i '/certificate =/a\        dhparam = "/etc/prosody/certs/xmpp.dhparam";' /etc/prosody/conf.avail/xmpp.cfg.lua
376
             sed -i '/certificate =/a\        dhparam = "/etc/prosody/certs/xmpp.dhparam";' /etc/prosody/conf.avail/xmpp.cfg.lua

+ 5
- 5
src/freedombone-base-email View File

1219
 
1219
 
1220
     if [[ $ONION_ONLY == 'no' ]]; then
1220
     if [[ $ONION_ONLY == 'no' ]]; then
1221
         # obtain a cert for the default domain
1221
         # obtain a cert for the default domain
1222
-        if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "0" ]]; then
1222
+        if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "0" ]]; then
1223
             echo $'Obtaining certificate for the main domain'
1223
             echo $'Obtaining certificate for the main domain'
1224
             create_site_certificate ${DEFAULT_DOMAIN_NAME} 'yes'
1224
             create_site_certificate ${DEFAULT_DOMAIN_NAME} 'yes'
1225
         fi
1225
         fi
1226
     fi
1226
     fi
1227
 
1227
 
1228
-    if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "0" ]]; then
1229
-        if [[ $(cert_exists dovecot) == "0" ]]; then
1228
+    if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "0" ]]; then
1229
+        if [[ "$(cert_exists dovecot)" == "0" ]]; then
1230
             ${PROJECT_NAME}-addcert -h dovecot --dhkey $DH_KEYLENGTH
1230
             ${PROJECT_NAME}-addcert -h dovecot --dhkey $DH_KEYLENGTH
1231
             check_certificates dovecot
1231
             check_certificates dovecot
1232
         fi
1232
         fi
1246
     fi
1246
     fi
1247
     sed -i 's|#ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
1247
     sed -i 's|#ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
1248
     sed -i 's|ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
1248
     sed -i 's|ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
1249
-    if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
1249
+    if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
1250
         sed -i "s|#ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/dovecot/conf.d/10-ssl.conf
1250
         sed -i "s|#ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/dovecot/conf.d/10-ssl.conf
1251
         sed -i "s|ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/dovecot/conf.d/10-ssl.conf
1251
         sed -i "s|ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/dovecot/conf.d/10-ssl.conf
1252
     else
1252
     else
1255
     fi
1255
     fi
1256
     sed -i "s|#ssl_key =.*|ssl_key = </etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
1256
     sed -i "s|#ssl_key =.*|ssl_key = </etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
1257
     sed -i "s|ssl_key =.*|ssl_key = </etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
1257
     sed -i "s|ssl_key =.*|ssl_key = </etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
1258
-    if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME}) == "1" ]]; then
1258
+    if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME})" == "1" ]]; then
1259
         sed -i "s|#ssl_dh_parameters_length.*|ssl_dh_parameters_length = ${DH_KEYLENGTH}|g" /etc/dovecot/conf.d/10-ssl.conf
1259
         sed -i "s|#ssl_dh_parameters_length.*|ssl_dh_parameters_length = ${DH_KEYLENGTH}|g" /etc/dovecot/conf.d/10-ssl.conf
1260
     fi
1260
     fi
1261
     sed -i 's/#ssl_prefer_server_ciphers.*/ssl_prefer_server_ciphers = yes/g' /etc/dovecot/conf.d/10-ssl.conf
1261
     sed -i 's/#ssl_prefer_server_ciphers.*/ssl_prefer_server_ciphers = yes/g' /etc/dovecot/conf.d/10-ssl.conf

+ 7
- 7
src/freedombone-utils-web View File

242
     fi
242
     fi
243
 
243
 
244
     if [[ $ONION_ONLY == "no" ]]; then
244
     if [[ $ONION_ONLY == "no" ]]; then
245
-        if [[ $(cert_exists $SITE_DOMAIN_NAME) == "0" ]]; then
245
+        if [[ "$(cert_exists ${SITE_DOMAIN_NAME})" == "0" ]]; then
246
             if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
246
             if [[ $LETSENCRYPT_ENABLED != "yes" ]]; then
247
                 create_self_signed_cert
247
                 create_self_signed_cert
248
             else
248
             else
250
             fi
250
             fi
251
         else
251
         else
252
             if [[ $LETSENCRYPT_ENABLED == "yes" ]]; then
252
             if [[ $LETSENCRYPT_ENABLED == "yes" ]]; then
253
-                if [[ $(cert_exists $SITE_DOMAIN_NAME pem) == "0" ]]; then
253
+                if [[ "$(cert_exists ${SITE_DOMAIN_NAME} pem)" == "0" ]]; then
254
                     create_letsencrypt_cert
254
                     create_letsencrypt_cert
255
                 fi
255
                 fi
256
             fi
256
             fi
657
             mkdir /etc/prosody/certs
657
             mkdir /etc/prosody/certs
658
         fi
658
         fi
659
 
659
 
660
-        if [[ $(cert_exists chat.${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
660
+        if [[ "$(cert_exists chat.${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
661
             sed -i 's|--Component "conference.|Component "chat.|g' /etc/prosody/prosody.cfg.lua
661
             sed -i 's|--Component "conference.|Component "chat.|g' /etc/prosody/prosody.cfg.lua
662
         fi
662
         fi
663
-        if [[ $(cert_exists xmpp.${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
663
+        if [[ "$(cert_exists xmpp.${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
664
             sed -i 's|--Component "conference.|Component "xmpp.|g' /etc/prosody/prosody.cfg.lua
664
             sed -i 's|--Component "conference.|Component "xmpp.|g' /etc/prosody/prosody.cfg.lua
665
         fi
665
         fi
666
-        if [[ $(cert_exists conference.${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
666
+        if [[ "$(cert_exists conference.${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
667
             sed -i 's|--Component "conference.|Component "conference.|g' /etc/prosody/prosody.cfg.lua
667
             sed -i 's|--Component "conference.|Component "conference.|g' /etc/prosody/prosody.cfg.lua
668
         fi
668
         fi
669
 
669
 
688
     fi
688
     fi
689
 
689
 
690
     if [ -d /var/lib/mumble-server ]; then
690
     if [ -d /var/lib/mumble-server ]; then
691
-        if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
691
+        if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
692
             cp /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem /var/lib/mumble-server/mumble.pem
692
             cp /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem /var/lib/mumble-server/mumble.pem
693
             cp /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam /var/lib/mumble-server/mumble.dhparam
693
             cp /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam /var/lib/mumble-server/mumble.dhparam
694
             cp /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key /var/lib/mumble-server/mumble.key
694
             cp /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key /var/lib/mumble-server/mumble.key
702
 
702
 
703
     if [ -d /home/znc/.znc ]; then
703
     if [ -d /home/znc/.znc ]; then
704
         echo $'znc found'
704
         echo $'znc found'
705
-        if [[ $(cert_exists ${DEFAULT_DOMAIN_NAME} pem) == "1" ]]; then
705
+        if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
706
             pkill znc
706
             pkill znc
707
             cat /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key > /home/znc/.znc/znc.pem
707
             cat /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key > /home/znc/.znc/znc.pem
708
             chown znc:znc /home/znc/.znc/znc.pem
708
             chown znc:znc /home/znc/.znc/znc.pem