Browse Source

Can specify microblog welcome message during interactive install

Bob Mottram 9 years ago
parent
commit
04860eb32c
1 changed files with 19 additions and 6 deletions
  1. 19
    6
      src/freedombone-config

+ 19
- 6
src/freedombone-config View File

@@ -95,6 +95,7 @@ HUBZILLA_DOMAIN_NAME=
95 95
 HUBZILLA_CODE=
96 96
 MICROBLOG_DOMAIN_NAME=
97 97
 MICROBLOG_CODE=
98
+MICROBLOG_WELCOME_MESSAGE=$"<h1>Welcome to \$MICROBLOG_DOMAIN_NAME – a federated microblog</h1><p>Another $PROJECT_NAME site</p>"
98 99
 GIT_DOMAIN_NAME=
99 100
 GIT_CODE=
100 101
 MEDIAGOBLIN_DOMAIN_NAME=
@@ -257,6 +258,9 @@ function save_configuration_file {
257 258
     if [ $MICROBLOG_CODE ]; then
258 259
         echo "MICROBLOG_CODE=$MICROBLOG_CODE" >> $CONFIGURATION_FILE
259 260
     fi
261
+    if [ $MICROBLOG_WELCOME_MESSAGE ]; then
262
+        echo "MICROBLOG_WELCOME_MESSAGE=$MICROBLOG_WELCOME_MESSAGE" >> $CONFIGURATION_FILE
263
+    fi
260 264
     if [ $GIT_DOMAIN_NAME ]; then
261 265
         echo "GIT_DOMAIN_NAME=$GIT_DOMAIN_NAME" >> $CONFIGURATION_FILE
262 266
     fi
@@ -1572,15 +1576,17 @@ function interactive_configuration {
1572 1576
                 if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
1573 1577
                     dialog --backtitle $"Freedombone Configuration" \
1574 1578
                            --title $"Microblog Configuration" \
1575
-                           --form $"\nPlease enter your Microblog details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \
1576
-                           $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
1577
-                           $"Code:" 2 1 "$(grep 'MICROBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
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 \
1578 1583
                            2> $data
1579 1584
                 else
1580 1585
                     dialog --backtitle $"Freedombone Configuration" \
1581 1586
                            --title $"Microblog Configuration" \
1582
-                           --form $"\nPlease enter your Microblog details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \
1583
-                           $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
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 \
1584 1590
                            2> $data
1585 1591
                 fi
1586 1592
                 sel=$?
@@ -1589,6 +1595,10 @@ function interactive_configuration {
1589 1595
                     255) exit 1;;
1590 1596
                 esac
1591 1597
                 MICROBLOG_DOMAIN_NAME=$(cat $data | sed -n 1p)
1598
+                welcome_msg=$(cat $data | sed -n 2p)
1599
+                if [ ${#welcome_msg} -gt 1 ]; then
1600
+                    MICROBLOG_WELCOME_MESSAGE=$welcome_msg
1601
+                fi
1592 1602
                 if [ $MICROBLOG_DOMAIN_NAME ]; then
1593 1603
                     if [[ $MICROBLOG_DOMAIN_NAME == "$HUBZILLA_DOMAIN_NAME" ]]; then
1594 1604
                         MICROBLOG_DOMAIN_NAME=""
@@ -1600,7 +1610,7 @@ function interactive_configuration {
1600 1610
                         dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
1601 1611
                     else
1602 1612
                         if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
1603
-                            MICROBLOG_CODE=$(cat $data | sed -n 2p)
1613
+                            MICROBLOG_CODE=$(cat $data | sed -n 3p)
1604 1614
                             if [ ${#MICROBLOG_CODE} -lt 30 ]; then
1605 1615
                                 MICROBLOG_DOMAIN_NAME=
1606 1616
                                 dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
@@ -1867,6 +1877,9 @@ function read_configuration {
1867 1877
         if grep -q "MICROBLOG_CODE" $CONFIGURATION_FILE; then
1868 1878
             MICROBLOG_CODE=$(grep "MICROBLOG_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1869 1879
         fi
1880
+        if grep -q "MICROBLOG_WELCOME_MESSAGE" $CONFIGURATION_FILE; then
1881
+            MICROBLOG_WELCOME_MESSAGE=$(grep "MICROBLOG_WELCOME_MESSAGE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1882
+        fi
1870 1883
         if grep -q "HUBZILLA_DOMAIN_NAME" $CONFIGURATION_FILE; then
1871 1884
             HUBZILLA_DOMAIN_NAME=$(grep "HUBZILLA_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1872 1885
         fi