Bob Mottram пре 7 година
родитељ
комит
88548b1a56
1 измењених фајлова са 5 додато и 5 уклоњено
  1. 5
    5
      src/freedombone-app-mumble

+ 5
- 5
src/freedombone-app-mumble Прегледај датотеку

258
         if [ ! -d /var/www/${DEFAULT_DOMAIN_NAME}/htdocs ]; then
258
         if [ ! -d /var/www/${DEFAULT_DOMAIN_NAME}/htdocs ]; then
259
             mkdir /var/www/${DEFAULT_DOMAIN_NAME}/htdocs
259
             mkdir /var/www/${DEFAULT_DOMAIN_NAME}/htdocs
260
         fi
260
         fi
261
-        if [ ! -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
261
+        if [ ! -f /etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem ]; then
262
             if [ -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt ]; then
262
             if [ -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt ]; then
263
                 rm /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt
263
                 rm /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt
264
             fi
264
             fi
281
 
281
 
282
 
282
 
283
     # Make an ssl cert for the server
283
     # Make an ssl cert for the server
284
-    if [ ! -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
284
+    if [ ! -f /etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem ]; then
285
         if [ ! -f /etc/ssl/certs/mumble.dhparam ]; then
285
         if [ ! -f /etc/ssl/certs/mumble.dhparam ]; then
286
             ${PROJECT_NAME}-addcert -h mumble --dhkey $DH_KEYLENGTH
286
             ${PROJECT_NAME}-addcert -h mumble --dhkey $DH_KEYLENGTH
287
             function_check check_certificates
287
             function_check check_certificates
323
         echo 'allowping=False' >> /etc/mumble-server.ini
323
         echo 'allowping=False' >> /etc/mumble-server.ini
324
     fi
324
     fi
325
     sed -i 's|allowping=.*|allowping=False|g' /etc/mumble-server.ini
325
     sed -i 's|allowping=.*|allowping=False|g' /etc/mumble-server.ini
326
-    if [ ! -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
326
+    if [ ! -f /etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem ]; then
327
         sed -i 's|#sslCert=.*|sslCert=/var/lib/mumble-server/mumble.pem|g' /etc/mumble-server.ini
327
         sed -i 's|#sslCert=.*|sslCert=/var/lib/mumble-server/mumble.pem|g' /etc/mumble-server.ini
328
         sed -i 's|#sslKey=.*|sslKey=/var/lib/mumble-server/mumble.key|g' /etc/mumble-server.ini
328
         sed -i 's|#sslKey=.*|sslKey=/var/lib/mumble-server/mumble.key|g' /etc/mumble-server.ini
329
     else
329
     else
330
-        sed -i "s|#sslCert=.*|sslCert=/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/mumble-server.ini
331
-        sed -i "s|#sslKey=.*|sslKey=/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/mumble-server.ini
330
+        sed -i "s|#sslCert=.*|sslCert=/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem|g" /etc/mumble-server.ini
331
+        sed -i "s|#sslKey=.*|sslKey=/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/privkey.pem|g" /etc/mumble-server.ini
332
     fi
332
     fi
333
     sed -i 's|#certrequired=.*|certrequired=True|g' /etc/mumble-server.ini
333
     sed -i 's|#certrequired=.*|certrequired=True|g' /etc/mumble-server.ini
334
     sed -i 's|users=100|users=10|g' /etc/mumble-server.ini
334
     sed -i 's|users=100|users=10|g' /etc/mumble-server.ini