Browse Source

movim fixes

Bob Mottram 7 years ago
parent
commit
2ebb305786
1 changed files with 5 additions and 1 deletions
  1. 5
    1
      src/freedombone-app-movim

+ 5
- 1
src/freedombone-app-movim View File

@@ -37,7 +37,7 @@ MOVIM_DOMAIN_NAME=
37 37
 MOVIM_CODE=
38 38
 MOVIM_ONION_PORT=8117
39 39
 MOVIM_REPO="https://github.com/movim/movim"
40
-MOVIM_COMMIT='add1a247804eb0e34fc28a74c2eeea16792ffa8e'
40
+MOVIM_COMMIT='6142c2033b7695448516a67690324a3bde048260'
41 41
 MOVIM_ADMIN_PASSWORD=
42 42
 MOVIM_DAEMON_PORT=8880
43 43
 
@@ -162,6 +162,7 @@ function upgrade_movim {
162 162
 
163 163
     cd /var/www/${MOVIM_DOMAIN_NAME}/htdocs
164 164
     php composer.phar install
165
+    php mud.php db --set
165 166
     chown -R www-data:www-data /var/www/${MOVIM_DOMAIN_NAME}/htdocs
166 167
 }
167 168
 
@@ -345,6 +346,9 @@ function install_movim {
345 346
     sed -i "s|'admin'|'${MY_USERNAME}'|g" /var/www/$MOVIM_DOMAIN_NAME/htdocs/app/models/config/Config.php
346 347
     sed -i "s|'password'|'${MOVIM_ADMIN_PASSWORD}'|g" /var/www/$MOVIM_DOMAIN_NAME/htdocs/app/models/config/Config.php
347 348
 
349
+    # Fix typo
350
+    sed -i 's|weksocket|websocket|g' app/widgets/AdminTest/admintest.js
351
+
348 352
     # curl -sS https://getcomposer.org/installer | php
349 353
     if [ -f ~/freedombone/image_build/composer_install ]; then
350 354
         cat ~/freedombone/image_build/composer_install | php