Преглед изворни кода

Improve mediagoblin daemon

Bob Mottram пре 8 година
родитељ
комит
8575817867
1 измењених фајлова са 3 додато и 16 уклоњено
  1. 3
    16
      src/freedombone-app-mediagoblin

+ 3
- 16
src/freedombone-app-mediagoblin Прегледај датотеку

253
     apt-get install -yq python python-dev python-lxml python-imaging python-virtualenv
253
     apt-get install -yq python python-dev python-lxml python-imaging python-virtualenv
254
     apt-get install -yq automake perl sqlite python-paste python-pastedeploy python-pastescript
254
     apt-get install -yq automake perl sqlite python-paste python-pastedeploy python-pastescript
255
     apt-get install -yq python3 python3-dev libpython3-dev python3-lxml python3-pil
255
     apt-get install -yq python3 python3-dev libpython3-dev python3-lxml python3-pil
256
-    useradd -c "GNU MediaGoblin system account" -d /var/lib/mediagoblin -m -r -g www-data mediagoblin
257
     groupadd mediagoblin
256
     groupadd mediagoblin
257
+    useradd -c "GNU MediaGoblin system account" -d /var/lib/mediagoblin -m -r -g www-data mediagoblin
258
     usermod --append -G mediagoblin mediagoblin
258
     usermod --append -G mediagoblin mediagoblin
259
     mkdir -p /var/lib/mediagoblin
259
     mkdir -p /var/lib/mediagoblin
260
     chown -hR mediagoblin:www-data /var/lib/mediagoblin
260
     chown -hR mediagoblin:www-data /var/lib/mediagoblin
430
     echo '[Service]' >> /etc/systemd/system/mediagoblin.service
430
     echo '[Service]' >> /etc/systemd/system/mediagoblin.service
431
     echo 'Type=simple' >> /etc/systemd/system/mediagoblin.service
431
     echo 'Type=simple' >> /etc/systemd/system/mediagoblin.service
432
     echo 'User=mediagoblin' >> /etc/systemd/system/mediagoblin.service
432
     echo 'User=mediagoblin' >> /etc/systemd/system/mediagoblin.service
433
+    echo 'Group=mediagoblin' >> /etc/systemd/system/mediagoblin.service
433
     echo "WorkingDirectory=$MEDIAGOBLIN_BASE_DIR/mediagoblin/" >> /etc/systemd/system/mediagoblin.service
434
     echo "WorkingDirectory=$MEDIAGOBLIN_BASE_DIR/mediagoblin/" >> /etc/systemd/system/mediagoblin.service
434
     echo "ExecStart=$MEDIAGOBLIN_BASE_DIR/mediagoblin/lazyserver.sh --server-name=fcgi fcgi_host=127.0.0.1 fcgi_port=$MEDIAGOBLIN_PORT" >> /etc/systemd/system/mediagoblin.service
435
     echo "ExecStart=$MEDIAGOBLIN_BASE_DIR/mediagoblin/lazyserver.sh --server-name=fcgi fcgi_host=127.0.0.1 fcgi_port=$MEDIAGOBLIN_PORT" >> /etc/systemd/system/mediagoblin.service
436
+    echo "Environment=MEDIAGOBLIN_CONFIG=$MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini CELERY_ALWAYS_EAGER=true" >> /etc/systemd/system/mediagoblin.service
435
     echo 'Restart=always' >> /etc/systemd/system/mediagoblin.service
437
     echo 'Restart=always' >> /etc/systemd/system/mediagoblin.service
436
     echo 'RestartSec=10' >> /etc/systemd/system/mediagoblin.service
438
     echo 'RestartSec=10' >> /etc/systemd/system/mediagoblin.service
437
     echo '' >> /etc/systemd/system/mediagoblin.service
439
     echo '' >> /etc/systemd/system/mediagoblin.service
443
     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && bin/gmg adduser --username $MY_USERNAME --password $MY_USERNAME $MEDIAGOBLIN_ADMIN_PASSWORD" - mediagoblin
445
     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && bin/gmg adduser --username $MY_USERNAME --password $MY_USERNAME $MEDIAGOBLIN_ADMIN_PASSWORD" - mediagoblin
444
     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && bin/gmg makeadmin $MY_USERNAME" - mediagoblin
446
     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && bin/gmg makeadmin $MY_USERNAME" - mediagoblin
445
 
447
 
446
-    sed -i 's|email_debug_mode.*|email_debug_mode = false|g' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin.ini
447
     sed -i 's|email_debug_mode.*|email_debug_mode = false|g' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini
448
     sed -i 's|email_debug_mode.*|email_debug_mode = false|g' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini
448
-    sed -i "s|email_sender_address.*|email_sender_address = \"noreply@${DEFAULT_DOMAIN_NAME}\"|g" $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin.ini
449
     sed -i "s|email_sender_address.*|email_sender_address = \"noreply@${DEFAULT_DOMAIN_NAME}\"|g" $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini
449
     sed -i "s|email_sender_address.*|email_sender_address = \"noreply@${DEFAULT_DOMAIN_NAME}\"|g" $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini
450
 
450
 
451
-    sed -i 's|allow_reporting.*|allow_reporting = false|g' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin.ini
452
     sed -i 's|allow_reporting.*|allow_reporting = false|g' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini
451
     sed -i 's|allow_reporting.*|allow_reporting = false|g' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini
453
 
452
 
454
-    if ! grep 'email_smtp_host' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin.ini; then
455
-        sed -i '/email_sender_address/a email_smtp_host = localhost' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin.ini
456
-    else
457
-        sed -i 's|email_smtp_host.*|email_smtp_host = localhost|g' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin.ini
458
-    fi
459
-
460
-    if ! grep 'email_smtp_host' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini; then
461
-        sed -i '/email_sender_address/a email_smtp_host = localhost' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin.ini
462
-    else
463
-        sed -i 's|email_smtp_host.*|email_smtp_host = localhost|g' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini
464
-    fi
465
-
466
     if ! grep '[[[skip_transcode]]]' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini; then
453
     if ! grep '[[[skip_transcode]]]' $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini; then
467
         echo '[[[skip_transcode]]]' >> $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini
454
         echo '[[[skip_transcode]]]' >> $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini
468
         echo 'mime_types = video/webm, video/ogg, video/mp4, audio/ogg, application/ogg, application/x-annodex' >> $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini
455
         echo 'mime_types = video/webm, video/ogg, video/mp4, audio/ogg, application/ogg, application/x-annodex' >> $MEDIAGOBLIN_BASE_DIR/mediagoblin/mediagoblin_local.ini