Explorar el Código

Bump etherpad commit

Bob Mottram hace 7 años
padre
commit
cf1ea58e44
Se han modificado 1 ficheros con 2 adiciones y 10 borrados
  1. 2
    10
      src/freedombone-app-etherpad

+ 2
- 10
src/freedombone-app-etherpad Ver fichero

@@ -38,7 +38,7 @@ ETHERPAD_CODE=
38 38
 ETHERPAD_ONION_PORT=8101
39 39
 ETHERPAD_PORT=9001
40 40
 ETHERPAD_REPO="https://github.com/ether/etherpad-lite"
41
-ETHERPAD_COMMIT='223127bf39d2ba431d9c1965a7f2aadadc73d77a'
41
+ETHERPAD_COMMIT='454f539561a8d9de51ed107a29d974eb79198bc6'
42 42
 ETHERPAD_ADMIN_PASSWORD=
43 43
 ETHERPAD_TITLE=$'Freedombone Docs'
44 44
 ETHERPAD_WELCOME_MESSAGE=$"Welcome to ${ETHERPAD_TITLE}!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!"
@@ -104,18 +104,10 @@ function create_etherpad_settings {
104 104
     echo "  \"title\": \"${ETHERPAD_TITLE}\"," >> $settings_file
105 105
     echo '  "favicon": "favicon.ico",' >> $settings_file
106 106
 
107
-    echo '  "ip": "0.0.0.0",' >> $settings_file
107
+    echo '  "ip": "127.0.0.1",' >> $settings_file
108 108
     echo "  \"port\" : ${ETHERPAD_PORT}," >> $settings_file
109 109
 
110 110
     echo '  "showSettingsInAdminPage" : true,' >> $settings_file
111
-
112
-    if [[ $ONION_ONLY == 'no' ]]; then
113
-        echo '  "ssl" : {' >> $settings_file
114
-        echo "            \"key\"  : \"/etc/ssl/private/${ETHERPAD_DOMAIN_NAME}.key\"," >> $settings_file
115
-        echo "            \"cert\" : \"/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.pem\"," >> $settings_file
116
-        echo '          },' >> $settings_file
117
-    fi
118
-
119 111
     echo '   "dbType" : "mysql",' >> $settings_file
120 112
     echo '   "dbSettings" : {' >> $settings_file
121 113
     echo '                    "user"    : "root",' >> $settings_file