Browse Source

Add conf extension

Bob Mottram 8 years ago
parent
commit
2a6e0b649d
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      src/freedombone-app-jitsi

+ 4
- 4
src/freedombone-app-jitsi View File

148
     fi
148
     fi
149
 
149
 
150
     if [ -f /etc/nginx/sites-available/${JITSI_DOMAIN_NAME} ]; then
150
     if [ -f /etc/nginx/sites-available/${JITSI_DOMAIN_NAME} ]; then
151
-        nginx_dissite ${JITSI_DOMAIN_NAME}
151
+        nginx_dissite ${JITSI_DOMAIN_NAME}.conf
152
         if [ -d /var/www/${JITSI_DOMAIN_NAME} ]; then
152
         if [ -d /var/www/${JITSI_DOMAIN_NAME} ]; then
153
             rm -rf /var/www/${JITSI_DOMAIN_NAME}
153
             rm -rf /var/www/${JITSI_DOMAIN_NAME}
154
         fi
154
         fi
229
 
229
 
230
     # add jitsi repo
230
     # add jitsi repo
231
     jitsi_deb_repo=binary
231
     jitsi_deb_repo=binary
232
-    apt-get -yq install wget debconf-utils
232
+    apt-get -yq install wget debconf-utils default-jre
233
     install_nodejs jitsi
233
     install_nodejs jitsi
234
     npm install -g browserify@13.1.1
234
     npm install -g browserify@13.1.1
235
     if ! grep "jitsi" /etc/apt/sources.list; then
235
     if ! grep "jitsi" /etc/apt/sources.list; then
258
     debconf-set-selections <<< "jitsi-meet jitsi-meet/cert-choice multiselect 1"
258
     debconf-set-selections <<< "jitsi-meet jitsi-meet/cert-choice multiselect 1"
259
     apt-get -yq install jitsi-meet jitsi-meet-prosody
259
     apt-get -yq install jitsi-meet jitsi-meet-prosody
260
 
260
 
261
-    jitsi_nginx_site=/etc/nginx/sites-available/$JITSI_DOMAIN_NAME
261
+    jitsi_nginx_site=/etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
262
     if [[ $ONION_ONLY == "no" ]]; then
262
     if [[ $ONION_ONLY == "no" ]]; then
263
         function_check nginx_http_redirect
263
         function_check nginx_http_redirect
264
         nginx_http_redirect $JITSI_DOMAIN_NAME
264
         nginx_http_redirect $JITSI_DOMAIN_NAME
375
     fi
375
     fi
376
 
376
 
377
     function_check nginx_ensite
377
     function_check nginx_ensite
378
-    nginx_ensite ${JITSI_DOMAIN_NAME}
378
+    nginx_ensite ${JITSI_DOMAIN_NAME}.conf
379
 
379
 
380
     set_completion_param "jitsi domain" "$JITSI_DOMAIN_NAME"
380
     set_completion_param "jitsi domain" "$JITSI_DOMAIN_NAME"
381
 
381