Browse Source

Default movim admin login

Bob Mottram 8 years ago
parent
commit
af10cdfad0
2 changed files with 14 additions and 2 deletions
  1. 13
    2
      src/freedombone-app-movim
  2. 1
    0
      src/freedombone-app-xmpp

+ 13
- 2
src/freedombone-app-movim View File

39
 MOVIM_REPO="https://github.com/movim/movim"
39
 MOVIM_REPO="https://github.com/movim/movim"
40
 MOVIM_COMMIT='add1a247804eb0e34fc28a74c2eeea16792ffa8e'
40
 MOVIM_COMMIT='add1a247804eb0e34fc28a74c2eeea16792ffa8e'
41
 MOVIM_ADMIN_PASSWORD=
41
 MOVIM_ADMIN_PASSWORD=
42
-MOVIM_DAEMON_PORT=8081
42
+MOVIM_DAEMON_PORT=8880
43
 
43
 
44
 movim_variables=(ONION_ONLY
44
 movim_variables=(ONION_ONLY
45
                  MOVIM_DOMAIN_NAME
45
                  MOVIM_DOMAIN_NAME
319
     repair_databases_script
319
     repair_databases_script
320
 
320
 
321
     apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
321
     apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
322
-    apt-get -yq install php5-memcached php5-intl exiftool
322
+    apt-get -yq install php5-memcached php5-intl exiftool php5-imagick
323
 
323
 
324
     if [ ! -d /var/www/$MOVIM_DOMAIN_NAME ]; then
324
     if [ ! -d /var/www/$MOVIM_DOMAIN_NAME ]; then
325
         mkdir /var/www/$MOVIM_DOMAIN_NAME
325
         mkdir /var/www/$MOVIM_DOMAIN_NAME
354
     sed -i "s|'database'.*|'database'    => 'movim'|g" db.inc.php
354
     sed -i "s|'database'.*|'database'    => 'movim'|g" db.inc.php
355
     php mud.php db --set
355
     php mud.php db --set
356
 
356
 
357
+    # default login
358
+    if [ ! -f /var/www/$MOVIM_DOMAIN_NAME/htdocs/app/models/config/Config.php ]; then
359
+        echo $'Unable to find Config.php'
360
+        exit 72352
361
+    fi
362
+    sed -i "s|'admin'|'${MY_USERNAME}'|g" /var/www/$MOVIM_DOMAIN_NAME/htdocs/app/models/config/Config.php
363
+    sed -i "s|'password'|'${MOVIM_ADMIN_PASSWORD}'|g" /var/www/$MOVIM_DOMAIN_NAME/htdocs/app/models/config/Config.php
364
+
357
     chmod u+rwx /var/www/$MOVIM_DOMAIN_NAME/htdocs
365
     chmod u+rwx /var/www/$MOVIM_DOMAIN_NAME/htdocs
358
     chown -R www-data:www-data /var/www/$MOVIM_DOMAIN_NAME/htdocs
366
     chown -R www-data:www-data /var/www/$MOVIM_DOMAIN_NAME/htdocs
359
 
367
 
378
     else
386
     else
379
         echo "ExecStart=/usr/bin/php /var/www/$MOVIM_DOMAIN_NAME/htdocs/daemon.php start --url=http://$MOVIM_ONION_HOSTNAME --port=$MOVIM_DAEMON_PORT" >> /etc/systemd/system/movim.service
387
         echo "ExecStart=/usr/bin/php /var/www/$MOVIM_DOMAIN_NAME/htdocs/daemon.php start --url=http://$MOVIM_ONION_HOSTNAME --port=$MOVIM_DAEMON_PORT" >> /etc/systemd/system/movim.service
380
     fi
388
     fi
389
+    echo 'StandardOutput=syslog' >> /etc/systemd/system/movim.service
390
+    echo 'SyslogIdentifier=movim' >> /etc/systemd/system/movim.service
391
+    echo 'PIDFile=/run/movim.pid' >> /etc/systemd/system/movim.service
381
     echo 'Restart=on-failure' >> /etc/systemd/system/movim.service
392
     echo 'Restart=on-failure' >> /etc/systemd/system/movim.service
382
     echo 'RestartSec=10' >> /etc/systemd/system/movim.service
393
     echo 'RestartSec=10' >> /etc/systemd/system/movim.service
383
     echo '' >> /etc/systemd/system/movim.service
394
     echo '' >> /etc/systemd/system/movim.service

+ 1
- 0
src/freedombone-app-xmpp View File

554
     filename=$1
554
     filename=$1
555
     echo 'modules_enabled = {' >> $filename
555
     echo 'modules_enabled = {' >> $filename
556
     echo '  "pubsub";' >> $filename
556
     echo '  "pubsub";' >> $filename
557
+    echo '  "pubsub_hub";' >> $filename
557
     echo '  "dialback"; -- s2s dialback support' >> $filename
558
     echo '  "dialback"; -- s2s dialback support' >> $filename
558
     echo '  "disco"; -- Service discovery' >> $filename
559
     echo '  "disco"; -- Service discovery' >> $filename
559
     echo '  "private"; -- Private XML storage (for room bookmarks, etc.)' >> $filename
560
     echo '  "private"; -- Private XML storage (for room bookmarks, etc.)' >> $filename