From 276ef767f1471c7d2c8d5c39909a99d6c8543423 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 9 Jan 2016 19:05:59 +0000 Subject: [PATCH] Revert "Try config" This reverts commit 697319496d1a620130351f257a2d94b39ce2dbcb. --- src/freedombone | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/freedombone b/src/freedombone index 8a627e4d..d8416e6a 100755 --- a/src/freedombone +++ b/src/freedombone @@ -8382,31 +8382,31 @@ quit" > $INSTALL_DIR/batch.sql nginx_ensite $MICROBLOG_DOMAIN_NAME # Create the configuration - echo ' /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo "if (!defined('GNUSOCIAL')) { exit(1); }" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo "$config['site']['name'] = 'Freedombone Social';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo "$config['site']['server'] = '$MICROBLOG_DOMAIN_NAME';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo "$config['site']['path'] = false;" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - if [[ $ONION_ONLY == "no" ]]; then - echo "$config['site']['ssl'] = 'always'; " >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - else - echo "$config['site']['ssl'] = 'never'; " >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - fi - echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo "$config['site']['fancy'] = true;" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo "$config['db']['database'] = 'mysqli://root:${MARIADB_PASSWORD}@localhost/gnusocial';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo "$config['db']['type'] = 'mysql';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo '// Uncomment below for better performance. Just remember you must run' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo '// php scripts/checkschema.php whenever your enabled plugins change!' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo "$config['db']['schemacheck'] = 'script';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php - echo "$config['site']['profile'] = 'community';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo ' /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo "if (!defined('GNUSOCIAL')) { exit(1); }" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo "$config['site']['name'] = 'Freedombone Social';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo "$config['site']['server'] = '$MICROBLOG_DOMAIN_NAME';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo "$config['site']['path'] = false;" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #if [[ $ONION_ONLY == "no" ]]; then + # echo "$config['site']['ssl'] = 'always'; " >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #else + # echo "$config['site']['ssl'] = 'never'; " >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #fi + #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo "$config['site']['fancy'] = true;" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo "$config['db']['database'] = 'mysqli://root:${MARIADB_PASSWORD}@localhost/gnusocial';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo "$config['db']['type'] = 'mysql';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo '// Uncomment below for better performance. Just remember you must run' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo '// php scripts/checkschema.php whenever your enabled plugins change!' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo "$config['db']['schemacheck'] = 'script';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php + #echo "$config['site']['profile'] = 'community';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php MICROBLOG_ONION_HOSTNAME=$(add_onion_service microblog 80 ${MICROBLOG_ONION_PORT})