소스 검색

Certificate paths

Bob Mottram 8 년 전
부모
커밋
16646473cb
1개의 변경된 파일9개의 추가작업 그리고 7개의 파일을 삭제
  1. 9
    7
      src/freedombone-app-jitsi

+ 9
- 7
src/freedombone-app-jitsi 파일 보기

@@ -362,22 +362,24 @@ function install_jitsi {
362 362
         mv /etc/ssl/certs/${JITSI_DOMAIN_NAME}.crt /etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem
363 363
     fi
364 364
 
365
+    # ensure that certs are available to prosody with correct permissions
366
+    cp /etc/ssl/certs/${JITSI_DOMAIN_NAME}.* /etc/prosody/certs
367
+    cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs
368
+    chown prosody:prosody /etc/prosody/certs/${JITSI_DOMAIN_NAME}.*
369
+
365 370
     if [ -f /etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem ]; then
366 371
         sed -i "s|.crt|.pem|g" $jitsi_nginx_site
367 372
         sed -i "s|.crt|.pem|g" /etc/prosody/conf.d/${JITSI_DOMAIN_NAME}.cfg.lua
368
-        sed -i "s|key =.*|key = \"/etc/ssl/private/${JITSI_DOMAIN_NAME}.key\"|g" /etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
369
-        sed -i "s|certificate =.*|certificate = \"/etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem\"|g" /etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
370 373
     fi
374
+
375
+    sed -i "s|key =.*|key = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.key\"|g" /etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
376
+    sed -i "s|certificate =.*|certificate = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem\"|g" /etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
377
+
371 378
     sed -i "s|.conf.crt|.crt|g" /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
372 379
     sed -i "s|.conf.pem|.pem|g" /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
373 380
     sed -i "s|.conf.key|.key|g" /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
374 381
     sed -i "s|.conf.dhparam|.dhparam|g" /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
375 382
 
376
-    # ensure that certs are available to prosody with correct permissions
377
-    cp /etc/ssl/certs/${JITSI_DOMAIN_NAME}.* /etc/prosody/certs
378
-    cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs
379
-    chown prosody:prosody /etc/prosody/certs/${JITSI_DOMAIN_NAME}.*
380
-
381 383
     function_check nginx_ensite
382 384
     nginx_ensite ${JITSI_DOMAIN_NAME}.conf
383 385