|
@@ -239,7 +239,7 @@ XMPP_DIRECTORY="/var/lib/prosody"
|
239
|
239
|
# With the only space character being between the server and the password
|
240
|
240
|
FRIENDS_SERVERS_LIST=/home/$MY_USERNAME/backup.list
|
241
|
241
|
|
242
|
|
-#list of encryption protocols
|
|
242
|
+# list of encryption protocols
|
243
|
243
|
SSL_PROTOCOLS="TLSv1 TLSv1.1 TLSv1.2"
|
244
|
244
|
|
245
|
245
|
# list of ciphers to use. See bettercrypto.org recommendations
|
|
@@ -248,6 +248,9 @@ SSL_CIPHERS="EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRS
|
248
|
248
|
# the default email address
|
249
|
249
|
MY_EMAIL_ADDRESS=$MY_USERNAME@$DOMAIN_NAME
|
250
|
250
|
|
|
251
|
+# optionally specify your name to appear on the blog
|
|
252
|
+MY_NAME=$DOMAIN_NAME
|
|
253
|
+
|
251
|
254
|
export DEBIAN_FRONTEND=noninteractive
|
252
|
255
|
|
253
|
256
|
# File which keeps track of what has already been installed
|
|
@@ -316,6 +319,9 @@ function argument_checks {
|
316
|
319
|
|
317
|
320
|
function read_configuration {
|
318
|
321
|
if [ -f $CONFIGURATION_FILE ]; then
|
|
322
|
+ if grep -q "MY_NAME" $CONFIGURATION_FILE; then
|
|
323
|
+ MY_NAME=$(grep "MY_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
324
|
+ fi
|
319
|
325
|
if grep -q "MY_EMAIL_ADDRESS" $CONFIGURATION_FILE; then
|
320
|
326
|
MY_EMAIL_ADDRESS=$(grep "MY_EMAIL_ADDRESS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
321
|
327
|
fi
|
|
@@ -3823,10 +3829,11 @@ function install_blog {
|
3823
|
3829
|
|
3824
|
3830
|
configure_php
|
3825
|
3831
|
cp /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini.example /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
3826
|
|
- sed -i "s/site.url.*/site.url = '$FULLBLOG_DOMAIN_NAME'/g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
|
3832
|
+ sed -i "s/site.url.*/site.url = 'https://$FULLBLOG_DOMAIN_NAME'/g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
3827
|
3833
|
sed -i "s/blog.title.*/blog.title = '$MY_BLOG_TITLE'/g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
3828
|
3834
|
sed -i "s/blog.tagline.*/blog.tagline = '$MY_BLOG_SUBTITLE'/g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
3829
|
3835
|
sed -i 's|timezone.*|timezone = "Europe/London"|g' /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
|
3836
|
+ sed -i "s/Your name/$MY_NAME/g" /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini
|
3830
|
3837
|
|
3831
|
3838
|
nginx_ensite $FULLBLOG_DOMAIN_NAME
|
3832
|
3839
|
service php5-fpm restart
|