free
/
freedombone
Suivre 1
Favoriser 0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

Install as mediagoblin user

Bob Mottram il y a 9 ans
Parent
f0476d31c4
révision
0c94e37ed1
1 fichiers modifiés avec 95 ajouts et 91 suppressions
Vue séparée Afficher les stats Diff
  1. 95
    91
      src/freedombone

+ 95
- 91
src/freedombone Voir le fichier 

@@ -9571,7 +9571,8 @@ function install_mediagoblin {
9571 9571 
         return
9572 9572 
     fi
9573 9573
9574 
-    apt-get -y install git-core python python-dev python-lxml python-imaging python-virtualenv npm nodejs-legacy automake
9574 
+    apt-get -y install git-core python python3-dev python3-lxml python3-pil
9575 
+	apt-get -y install python3-virtualenv npm nodejs-legacy automake
9575 9576
9576 9577 
     #apt-get -y install postgresql postgresql-client python-psycopg2
9577 9578 
     #apt-get -y install python-gst-1.0 libjpeg62-turbo-dev gstreamer1.0-plugins-base python-gobject
 
@@ -9592,6 +9593,8 @@ function install_mediagoblin {
9592 9593 
     git_clone $MEDIAGOBLIN_REPO $MEDIAGOBLIN_WORKING_DIRECTORY
9593 9594 
     cd $MEDIAGOBLIN_WORKING_DIRECTORY
9594 9595 
     git checkout $MEDIAGOBLIN_COMMIT -b $MEDIAGOBLIN_COMMIT
9596 
+	git submodule init
9597 
+	git submodule update
9595 9598
9596 9599 
     if ! grep -q "Mediagoblin commit" $COMPLETION_FILE; then
9597 9600 
         echo "Mediagoblin commit:$MEDIAGOBLIN_COMMIT" >> $COMPLETION_FILE
 
@@ -9599,17 +9602,18 @@ function install_mediagoblin {
9599 9602 
         sed -i "s/Mediagoblin commit.*/Mediagoblin commit:$MEDIAGOBLIN_COMMIT/g" $COMPLETION_FILE
9600 9603 
     fi
9601 9604
9602 
-    ./bootstrap.sh
9605 
+    chown -hR mediagoblin:www-data $MEDIAGOBLIN_WORKING_DIRECTORY
9606 
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./bootstrap.sh" - mediagoblin
9603 9607 
     if [ ! "$?" = "0" ]; then
9604 9608 
         exit 278826
9605 9609 
     fi
9606 9610
9607 
-    ./configure --with-python3 --without-virtualenv
9611 
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && ./configure --with-python3" - mediagoblin
9608 9612 
     if [ ! "$?" = "0" ]; then
9609 9613 
         exit 462826
9610 9614 
     fi
9611 9615
9612 
-    make
9616 
+    su -c "cd $MEDIAGOBLIN_WORKING_DIRECTORY && make" - mediagoblin
9613 9617 
     if [ ! "$?" = "0" ]; then
9614 9618 
         exit 738229
9615 9619 
     fi
 
@@ -9650,7 +9654,7 @@ function install_mediagoblin {
9650 9654 
     echo 'User=mediagoblin' >> /etc/systemd/system/mediagoblin.service
9651 9655 
     echo 'Group=mediagoblin' >> /etc/systemd/system/mediagoblin.service
9652 9656 
     echo "WorkingDirectory=$MEDIAGOBLIN_WORKING_DIRECTORY" >> /etc/systemd/system/mediagoblin.service
9653 
-    echo "ExecStart=$MEDIAGOBLIN_WORKING_DIRECTORY/lazyserver.sh  --server-name=fcgi fcgi_host=127.0.0.1 fcgi_port=26543" >> /etc/systemd/system/mediagoblin.service
9657 
+    echo "ExecStart=$MEDIAGOBLIN_WORKING_DIRECTORY/lazyserver.sh --server-name=fcgi fcgi_host=127.0.0.1 fcgi_port=26543" >> /etc/systemd/system/mediagoblin.service
9654 9658 
     echo 'Restart=always' >> /etc/systemd/system/mediagoblin.service
9655 9659 
     echo 'Environment="USER=mediagoblin","HOME=/var/lib/mediagoblin"' >> /etc/systemd/system/mediagoblin.service
9656 9660 
     echo '' >> /etc/systemd/system/mediagoblin.service
 
@@ -9678,92 +9682,92 @@ function install_mediagoblin {
9678 9682 
         echo 'server {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9679 9683 
         echo '  listen 443 ssl;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9680 9684 
         echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9681 
-        echo '  # Stock useful config options, but ignore them :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
9682 
-        echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9683 
-        echo '  include /etc/nginx/mime.types;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9684 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9685 
-        echo '  autoindex off;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9686 
-        echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9687 
-        echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9688 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9689 
-        nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
9690 
-        nginx_ssl $MEDIAGOBLIN_DOMAIN_NAME
9691 
-        nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
9692 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9693 
-        echo '  # Gzip' >> $MEDIAGOBLIN_VIRTUAL_HOST
9694 
-        echo '  gzip on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9695 
-        echo '  gzip_min_length 1024;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9696 
-        echo '  gzip_buffers 4 32k;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9697 
-        echo '  gzip_types text/plain application/x-javascript text/javascript text/xml text/css;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9698 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9699 
-        echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9700 
-        echo '  # Mounting MediaGoblin stuff' >> $MEDIAGOBLIN_VIRTUAL_HOST
9701 
-        echo '  # This is the section you should read' >> $MEDIAGOBLIN_VIRTUAL_HOST
9702 
-        echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9703 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9704 
-        echo "  server_name $MEDIAGOBLIN_DOMAIN_NAME;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9705 
-        echo '  access_log /var/log/nginx/mediagoblin.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9706 
-        echo '  error_log /var/log/nginx/mediagoblin.error.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9707 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9708 
-        echo '  # MediaGoblins stock static files: CSS, JS, etc.' >> $MEDIAGOBLIN_VIRTUAL_HOST
9709 
-        echo '  location /mgoblin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9710 
-        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/mediagoblin/static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9711 
-        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
9712 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9713 
-        echo '  # Instance specific media:' >> $MEDIAGOBLIN_VIRTUAL_HOST
9714 
-        echo '  location /mgoblin_media/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9715 
-        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/media/public/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9716 
-        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
9717 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9718 
-        echo '  # Theme static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
9719 
-        echo '  location /theme_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9720 
-        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/theme_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9721 
-        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
9722 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9723 
-        echo '  # Plugin static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
9724 
-        echo '  location /plugin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9725 
-        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/plugin_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9726 
-        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
9727 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9728 
-        echo '  # Mounting MediaGoblin itself via FastCGI.' >> $MEDIAGOBLIN_VIRTUAL_HOST
9729 
-        echo '  location / {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9730 
-        echo '    fastcgi_pass 127.0.0.1:26543;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9731 
-        echo '    include /etc/nginx/fastcgi_params;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9732 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9733 
-        echo '    # our understanding vs nginxs handling of script_name vs' >> $MEDIAGOBLIN_VIRTUAL_HOST
9734 
-        echo '      # path_info dont match :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
9735 
-        echo '    fastcgi_param PATH_INFO $fastcgi_script_name;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9736 
-        echo '    fastcgi_param SCRIPT_NAME "";' >> $MEDIAGOBLIN_VIRTUAL_HOST
9737 
-        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
9738 
-        echo '}' >> $MEDIAGOBLIN_VIRTUAL_HOST
9739 
-        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9740 
-    else
9741 
-        echo -n '' > $MEDIAGOBLIN_VIRTUAL_HOST
9742 
-    fi
9743 
-
9744 
-    echo 'server {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9745 
-    echo "  listen 127.0.0.1:${MEDIAGOBLIN_ONION_PORT} default_server;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9746 
-    echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9747 
-    echo '  # Stock useful config options, but ignore them :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
9748 
-    echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9749 
-    echo '  include /etc/nginx/mime.types;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9750 
-    echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9751 
-    echo '  autoindex off;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9752 
-    echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9753 
-    echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9754 
-    echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9755 
-    nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
9756 
-    nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
9757 
-    echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9758 
-    echo '  # Gzip' >> $MEDIAGOBLIN_VIRTUAL_HOST
9759 
-    echo '  gzip on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9760 
-    echo '  gzip_min_length 1024;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9761 
-    echo '  gzip_buffers 4 32k;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9762 
-    echo '  gzip_types text/plain application/x-javascript text/javascript text/xml text/css;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9763 
-    echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9764 
-    echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9765 
-    echo '  # Mounting MediaGoblin stuff' >> $MEDIAGOBLIN_VIRTUAL_HOST
9766 
-    echo '  # This is the section you should read' >> $MEDIAGOBLIN_VIRTUAL_HOST
9685 
+		echo '  # Stock useful config options, but ignore them :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
9686 
+		echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9687 
+		echo '  include /etc/nginx/mime.types;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9688 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9689 
+		echo '  autoindex off;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9690 
+		echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9691 
+		echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9692 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9693 
+		nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
9694 
+		nginx_ssl $MEDIAGOBLIN_DOMAIN_NAME
9695 
+		nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
9696 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9697 
+		echo '  # Gzip' >> $MEDIAGOBLIN_VIRTUAL_HOST
9698 
+		echo '  gzip on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9699 
+		echo '  gzip_min_length 1024;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9700 
+		echo '  gzip_buffers 4 32k;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9701 
+		echo '  gzip_types text/plain application/x-javascript text/javascript text/xml text/css;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9702 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9703 
+		echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9704 
+		echo '  # Mounting MediaGoblin stuff' >> $MEDIAGOBLIN_VIRTUAL_HOST
9705 
+		echo '  # This is the section you should read' >> $MEDIAGOBLIN_VIRTUAL_HOST
9706 
+		echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9707 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9708 
+		echo "  server_name $MEDIAGOBLIN_DOMAIN_NAME;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9709 
+		echo '  access_log /var/log/nginx/mediagoblin.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9710 
+		echo '  error_log /var/log/nginx/mediagoblin.error.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9711 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9712 
+		echo '  # MediaGoblins stock static files: CSS, JS, etc.' >> $MEDIAGOBLIN_VIRTUAL_HOST
9713 
+		echo '  location /mgoblin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9714 
+		echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/mediagoblin/static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9715 
+		echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
9716 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9717 
+		echo '  # Instance specific media:' >> $MEDIAGOBLIN_VIRTUAL_HOST
9718 
+		echo '  location /mgoblin_media/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9719 
+		echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/media/public/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9720 
+		echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
9721 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9722 
+		echo '  # Theme static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
9723 
+		echo '  location /theme_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9724 
+		echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/theme_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9725 
+		echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
9726 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9727 
+		echo '  # Plugin static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
9728 
+		echo '  location /plugin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9729 
+		echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/plugin_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9730 
+		echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
9731 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9732 
+		echo '  # Mounting MediaGoblin itself via FastCGI.' >> $MEDIAGOBLIN_VIRTUAL_HOST
9733 
+		echo '  location / {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9734 
+		echo '    fastcgi_pass 127.0.0.1:26543;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9735 
+		echo '    include /etc/nginx/fastcgi_params;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9736 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9737 
+		echo '    # our understanding vs nginxs handling of script_name vs' >> $MEDIAGOBLIN_VIRTUAL_HOST
9738 
+		echo '      # path_info dont match :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
9739 
+		echo '    fastcgi_param PATH_INFO $fastcgi_script_name;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9740 
+		echo '    fastcgi_param SCRIPT_NAME "";' >> $MEDIAGOBLIN_VIRTUAL_HOST
9741 
+		echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
9742 
+		echo '}' >> $MEDIAGOBLIN_VIRTUAL_HOST
9743 
+		echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9744 
+	else
9745 
+		echo -n '' > $MEDIAGOBLIN_VIRTUAL_HOST
9746 
+	fi
9747 
+
9748 
+	echo 'server {' >> $MEDIAGOBLIN_VIRTUAL_HOST
9749 
+	echo "  listen 127.0.0.1:${MEDIAGOBLIN_ONION_PORT} default_server;" >> $MEDIAGOBLIN_VIRTUAL_HOST
9750 
+	echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9751 
+	echo '  # Stock useful config options, but ignore them :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
9752 
+	echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9753 
+	echo '  include /etc/nginx/mime.types;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9754 
+	echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9755 
+	echo '  autoindex off;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9756 
+	echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9757 
+	echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9758 
+	echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9759 
+	nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
9760 
+	nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
9761 
+	echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9762 
+	echo '  # Gzip' >> $MEDIAGOBLIN_VIRTUAL_HOST
9763 
+	echo '  gzip on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9764 
+	echo '  gzip_min_length 1024;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9765 
+	echo '  gzip_buffers 4 32k;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9766 
+	echo '  gzip_types text/plain application/x-javascript text/javascript text/xml text/css;' >> $MEDIAGOBLIN_VIRTUAL_HOST
9767 
+	echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9768 
+	echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9769 
+	echo '  # Mounting MediaGoblin stuff' >> $MEDIAGOBLIN_VIRTUAL_HOST
9770 
+	echo '  # This is the section you should read' >> $MEDIAGOBLIN_VIRTUAL_HOST
9767 9771 
     echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
9768 9772 
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
9769 9773 
     echo "  server_name $MEDIAGOBLIN_ONION_HOSTNAME;" >> $MEDIAGOBLIN_VIRTUAL_HOST