|
@@ -96,6 +96,7 @@ HUBZILLA_CODE=
|
96
|
96
|
MICROBLOG_DOMAIN_NAME=
|
97
|
97
|
MICROBLOG_CODE=
|
98
|
98
|
MICROBLOG_WELCOME_MESSAGE=$"<h1>Welcome to \$MICROBLOG_DOMAIN_NAME – a federated microblog</h1><p>Another $PROJECT_NAME site</p>"
|
|
99
|
+MICROBLOG_BACKGROUND_IMAGE_URL=
|
99
|
100
|
GIT_DOMAIN_NAME=
|
100
|
101
|
GIT_CODE=
|
101
|
102
|
MEDIAGOBLIN_DOMAIN_NAME=
|
|
@@ -261,6 +262,9 @@ function save_configuration_file {
|
261
|
262
|
if [ $MICROBLOG_WELCOME_MESSAGE ]; then
|
262
|
263
|
echo "MICROBLOG_WELCOME_MESSAGE=$MICROBLOG_WELCOME_MESSAGE" >> $CONFIGURATION_FILE
|
263
|
264
|
fi
|
|
265
|
+ if [ $MICROBLOG_BACKGROUND_IMAGE_URL ]; then
|
|
266
|
+ echo "MICROBLOG_BACKGROUND_IMAGE_URL=$MICROBLOG_BACKGROUND_IMAGE_URL" >> $CONFIGURATION_FILE
|
|
267
|
+ fi
|
264
|
268
|
if [ $GIT_DOMAIN_NAME ]; then
|
265
|
269
|
echo "GIT_DOMAIN_NAME=$GIT_DOMAIN_NAME" >> $CONFIGURATION_FILE
|
266
|
270
|
fi
|
|
@@ -1576,17 +1580,19 @@ function interactive_configuration {
|
1576
|
1580
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1577
|
1581
|
dialog --backtitle $"Freedombone Configuration" \
|
1578
|
1582
|
--title $"Microblog Configuration" \
|
1579
|
|
- --form $"\nPlease enter your Microblog details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 65 3 \
|
1580
|
|
- $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 20 25 30 \
|
1581
|
|
- $"Welcome Message:" 2 1 "$(grep '$MICROBLOG_WELCOME_MESSAGE' temp.cfg | awk -F '=' '{print $2}')" 3 20 50 30 \
|
1582
|
|
- $"Code:" 3 1 "$(grep 'MICROBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 20 25 30 \
|
|
1583
|
+ --form $"\nPlease enter your Microblog details. Welcome message and background image URL can be left blank.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 16 65 4 \
|
|
1584
|
+ $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 25 25 30 \
|
|
1585
|
+ $"Welcome Message:" 2 1 "$(grep '$MICROBLOG_WELCOME_MESSAGE' temp.cfg | awk -F '=' '{print $2}')" 2 25 255 30 \
|
|
1586
|
+ $"Background image URL:" 3 1 "$(grep '$MICROBLOG_BACKGROUND_IMAGE_URL' temp.cfg | awk -F '=' '{print $2}')" 3 25 255 30 \
|
|
1587
|
+ $"Code:" 4 1 "$(grep 'MICROBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 4 25 25 30 \
|
1583
|
1588
|
2> $data
|
1584
|
1589
|
else
|
1585
|
1590
|
dialog --backtitle $"Freedombone Configuration" \
|
1586
|
1591
|
--title $"Microblog Configuration" \
|
1587
|
|
- --form $"\nPlease enter your Microblog details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 13 65 3 \
|
1588
|
|
- $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 20 25 30 \
|
1589
|
|
- $"Welcome Message:" 2 1 "$(grep '$MICROBLOG_WELCOME_MESSAGE' temp.cfg | awk -F '=' '{print $2}')" 2 20 50 30 \
|
|
1592
|
+ --form $"\nPlease enter your Microblog details. Welcome message and background image URL can be left blank.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 16 65 4 \
|
|
1593
|
+ $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 25 25 30 \
|
|
1594
|
+ $"Welcome Message:" 2 1 "$(grep '$MICROBLOG_WELCOME_MESSAGE' temp.cfg | awk -F '=' '{print $2}')" 2 25 255 30 \
|
|
1595
|
+ $"Background image URL:" 3 1 "$(grep '$MICROBLOG_BACKGROUND_IMAGE_URL' temp.cfg | awk -F '=' '{print $2}')" 3 25 255 30 \
|
1590
|
1596
|
2> $data
|
1591
|
1597
|
fi
|
1592
|
1598
|
sel=$?
|
|
@@ -1599,6 +1605,10 @@ function interactive_configuration {
|
1599
|
1605
|
if [ ${#welcome_msg} -gt 1 ]; then
|
1600
|
1606
|
MICROBLOG_WELCOME_MESSAGE=$welcome_msg
|
1601
|
1607
|
fi
|
|
1608
|
+ img_url=$(cat $data | sed -n 3p)
|
|
1609
|
+ if [ ${#img_url} -gt 1 ]; then
|
|
1610
|
+ MICROBLOG_BACKGROUND_IMAGE_URL=$img_url
|
|
1611
|
+ fi
|
1602
|
1612
|
if [ $MICROBLOG_DOMAIN_NAME ]; then
|
1603
|
1613
|
if [[ $MICROBLOG_DOMAIN_NAME == "$HUBZILLA_DOMAIN_NAME" ]]; then
|
1604
|
1614
|
MICROBLOG_DOMAIN_NAME=""
|
|
@@ -1610,7 +1620,7 @@ function interactive_configuration {
|
1610
|
1620
|
dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
1611
|
1621
|
else
|
1612
|
1622
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1613
|
|
- MICROBLOG_CODE=$(cat $data | sed -n 3p)
|
|
1623
|
+ MICROBLOG_CODE=$(cat $data | sed -n 4p)
|
1614
|
1624
|
if [ ${#MICROBLOG_CODE} -lt 30 ]; then
|
1615
|
1625
|
MICROBLOG_DOMAIN_NAME=
|
1616
|
1626
|
dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
@@ -1880,6 +1890,9 @@ function read_configuration {
|
1880
|
1890
|
if grep -q "MICROBLOG_WELCOME_MESSAGE" $CONFIGURATION_FILE; then
|
1881
|
1891
|
MICROBLOG_WELCOME_MESSAGE=$(grep "MICROBLOG_WELCOME_MESSAGE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1882
|
1892
|
fi
|
|
1893
|
+ if grep -q "MICROBLOG_BACKGROUND_IMAGE_URL" $CONFIGURATION_FILE; then
|
|
1894
|
+ MICROBLOG_BACKGROUND_IMAGE_URL=$(grep "MICROBLOG_BACKGROUND_IMAGE_URL" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
1895
|
+ fi
|
1883
|
1896
|
if grep -q "HUBZILLA_DOMAIN_NAME" $CONFIGURATION_FILE; then
|
1884
|
1897
|
HUBZILLA_DOMAIN_NAME=$(grep "HUBZILLA_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1885
|
1898
|
fi
|