Kaynağa Gözat

Fix gnusocial for onion-only installs

Bob Mottram 9 yıl önce
ebeveyn
işleme
fa194ce56d
1 değiştirilmiş dosya ile 10 ekleme ve 5 silme
  1. 10
    5
      src/freedombone

+ 10
- 5
src/freedombone Dosyayı Görüntüle

@@ -200,7 +200,7 @@ MICROBLOG_COMMIT='f10625f8bc59e3ae52da07fdba910329fad540a3'
200 200
 MICROBLOG_ADMIN_PASSWORD=
201 201
 MICROBLOG_THEME_REPO="https://git.gnu.io/h2p/Qvitter.git"
202 202
 MICROBLOG_THEME_COMMIT='2816507545bb7e3da5b0a290692576b8d2ee335f'
203
-MICROBLOG_WELCOME_MESSAGE=$'<h1>Welcome to $MICROBLOG_DOMAIN_NAME – a federated microblog</h1><p>Another Freedombone site</p>'
203
+MICROBLOG_WELCOME_MESSAGE=$'<h1>Welcome to GNU Social – a federated microblog</h1><p>Another Freedombone site</p>'
204 204
 MICROBLOG_BACKGROUND_IMAGE_URL=
205 205
 MICROBLOG_MARKDOWN_REPO="https://github.com/chimo/gs-markdown"
206 206
 MICROBLOG_MARKDOWN_COMMIT='184801fba1418548045242f4a55d55c29f6a06da'
@@ -8724,17 +8724,24 @@ function install_gnu_social {
8724 8724
         gnu_social_ssl='never'
8725 8725
     fi
8726 8726
 
8727
+    MICROBLOG_ONION_HOSTNAME=$(add_onion_service microblog 80 ${MICROBLOG_ONION_PORT})
8728
+
8729
+    MICROBLOG_SERVER=${MICROBLOG_DOMAIN_NAME}
8730
+    if [[ $ONION_ONLY != 'no' ]]; then
8731
+        MICROBLOG_SERVER=${MICROBLOG_ONION_HOSTNAME}
8732
+    fi
8733
+
8727 8734
     # Create the configuration
8728 8735
     gnu_social_installer=/var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/scripts/install_cli.php
8729 8736
     if [ ! -f $gnu_social_installer ]; then
8730 8737
         echo $'No GNU Social commandline installer found'
8731 8738
         exit 53026
8732 8739
     fi
8733
-    ${gnu_social_installer} --server "${MICROBLOG_DOMAIN_NAME}" \
8740
+    ${gnu_social_installer} --server "${MICROBLOG_SERVER}" \
8734 8741
                             --host="localhost" --database="gnusocial" \
8735 8742
                             --dbtype=mysql --username="root" -v \
8736 8743
                             --password="$MARIADB_PASSWORD" \
8737
-                            --sitename="${MICROBLOG_DOMAIN_NAME}" --fancy='yes' \
8744
+                            --sitename=$"GNU Social" --fancy='yes' \
8738 8745
                             --admin-nick="$MY_USERNAME" \
8739 8746
                             --admin-pass="$MICROBLOG_ADMIN_PASSWORD" \
8740 8747
                             --site-profile="community" \
@@ -8769,8 +8776,6 @@ function install_gnu_social {
8769 8776
     # This improves performance
8770 8777
     sed -i "s|//\$config\['db'\]\['schemacheck'\].*|\$config\['db'\]\['schemacheck'\] = 'script';|g" $microblog_config_file
8771 8778
 
8772
-    MICROBLOG_ONION_HOSTNAME=$(add_onion_service microblog 80 ${MICROBLOG_ONION_PORT})
8773
-
8774 8779
     systemctl restart php5-fpm
8775 8780
     systemctl restart nginx
8776 8781