Bob Mottram 9 years ago
parent
commit
6b3c7bd278
1 changed files with 13 additions and 13 deletions
  1. 13
    13
      src/freedombone

+ 13
- 13
src/freedombone View File

@@ -1070,7 +1070,7 @@ function read_configuration {
1070 1070
         # Ensure that a copy of the config exists for upgrade purposes
1071 1071
         if [[ $CONFIGURATION_FILE != "/root/${PROJECT_NAME}.cfg" ]]; then
1072 1072
             cp $CONFIGURATION_FILE /root/${PROJECT_NAME}.cfg
1073
-        fi      
1073
+        fi
1074 1074
         if grep -q "VOIP_TURN_PORT" $CONFIGURATION_FILE; then
1075 1075
             VOIP_TURN_PORT=$(grep "VOIP_TURN_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1076 1076
         fi
@@ -9601,7 +9601,7 @@ function install_mediagoblin {
9601 9601
 
9602 9602
     if [ ! -d $MEDIAGOBLIN_WORKING_DIRECTORY ]; then
9603 9603
         mkdir -p $MEDIAGOBLIN_WORKING_DIRECTORY
9604
-    fi  
9604
+    fi
9605 9605
 
9606 9606
     git_clone $MEDIAGOBLIN_REPO $MEDIAGOBLIN_WORKING_DIRECTORY
9607 9607
     cd $MEDIAGOBLIN_WORKING_DIRECTORY
@@ -9611,17 +9611,17 @@ function install_mediagoblin {
9611 9611
     if [ ! "$?" = "0" ]; then
9612 9612
         exit 278826
9613 9613
     fi
9614
-    
9614
+
9615 9615
     ./configure --with-python3 --without-virtualenv
9616 9616
     if [ ! "$?" = "0" ]; then
9617 9617
         exit 462826
9618 9618
     fi
9619
-    
9619
+
9620 9620
     make
9621 9621
     if [ ! "$?" = "0" ]; then
9622 9622
         exit 738229
9623 9623
     fi
9624
-    
9624
+
9625 9625
     if [ ! -d $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev ]; then
9626 9626
         mkdir $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev
9627 9627
     fi
@@ -9638,14 +9638,14 @@ function install_mediagoblin {
9638 9638
         echo $'paste.ini not found'
9639 9639
         exit 52762
9640 9640
     fi
9641
-    
9641
+
9642 9642
     cp -av mediagoblin.ini mediagoblin_local.ini
9643 9643
     cp -av paste.ini paste_local.ini
9644 9644
 
9645 9645
     # TODO configure ini files
9646 9646
 
9647 9647
     chown -hR mediagoblin:www-data $MEDIAGOBLIN_WORKING_DIRECTORY
9648
-    
9648
+
9649 9649
     # init with systemd
9650 9650
     echo '[Unit]' > /etc/systemd/system/mediagoblin.service
9651 9651
     echo 'Description=Mediagoblin (Media Server)' >> /etc/systemd/system/mediagoblin.service
@@ -9667,7 +9667,7 @@ function install_mediagoblin {
9667 9667
     systemctl daemon-reload
9668 9668
     systemctl enable mediagoblin
9669 9669
     systemctl start mediagoblin
9670
-    
9670
+
9671 9671
     # web config
9672 9672
     MEDIAGOBLIN_VIRTUAL_HOST=/etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
9673 9673
     echo 'server {' > $MEDIAGOBLIN_VIRTUAL_HOST
@@ -9748,7 +9748,7 @@ function install_mediagoblin {
9748 9748
     # update the dynamic DNS
9749 9749
     CURRENT_DDNS_DOMAIN=$MEDIAGOBLIN_DOMAIN_NAME
9750 9750
     add_ddns_domain
9751
-    
9751
+
9752 9752
     echo 'install_mediagoblin' >> $COMPLETION_FILE
9753 9753
 }
9754 9754
 
@@ -10442,7 +10442,7 @@ function install_sip_turn {
10442 10442
             fi
10443 10443
         fi
10444 10444
     fi
10445
-    
10445
+
10446 10446
     echo '##' > /etc/turnserver/turnserver.conf
10447 10447
     echo '# TurnServer configuration file.' >> /etc/turnserver/turnserver.conf
10448 10448
     echo '#' >> /etc/turnserver/turnserver.conf
@@ -10539,12 +10539,12 @@ function install_sip_turn {
10539 10539
     echo '## Certification Authority file.' >> /etc/turnserver/turnserver.conf
10540 10540
     echo "ca_file = \"/etc/ssl/certs/ca-certificates.crt\"" >> /etc/turnserver/turnserver.conf
10541 10541
     echo '' >> /etc/turnserver/turnserver.conf
10542
-    echo '## Server certificate file.' >> /etc/turnserver/turnserver.conf   
10542
+    echo '## Server certificate file.' >> /etc/turnserver/turnserver.conf
10543 10543
     if [ -f /etc/ssl/certs/$DEFAULT_DOMAIN_NAME.pem ]; then
10544 10544
         echo "cert_file = \"/etc/ssl/certs/$DEFAULT_DOMAIN_NAME.pem\"" >> /etc/turnserver/turnserver.conf
10545 10545
     else
10546 10546
         if [ -f /etc/ssl/certs/$DEFAULT_DOMAIN_NAME.crt ]; then
10547
-            echo "cert_file = \"/etc/ssl/certs/$DEFAULT_DOMAIN_NAME.crt\"" >> /etc/turnserver/turnserver.conf           
10547
+            echo "cert_file = \"/etc/ssl/certs/$DEFAULT_DOMAIN_NAME.crt\"" >> /etc/turnserver/turnserver.conf
10548 10548
         fi
10549 10549
     fi
10550 10550
     echo '' >> /etc/turnserver/turnserver.conf
@@ -10561,7 +10561,7 @@ function install_sip_turn {
10561 10561
     echo 'mod_tmpuser = false' >> /etc/turnserver/turnserver.conf
10562 10562
 
10563 10563
     echo "${MY_USERNAME}:password:${DEFAULT_DOMAIN_NAME}:authorized" > /etc/turnserver/turnusers.txt
10564
-    
10564
+
10565 10565
     systemctl restart turnserver
10566 10566
 
10567 10567
     echo 'install_sip_turn' >> $COMPLETION_FILE