Browse Source

Mediagoblin domain name and code

Bob Mottram 10 years ago
parent
commit
b3bcde5f70
2 changed files with 33 additions and 0 deletions
  1. 19
    0
      src/freedombone
  2. 14
    0
      src/freedombone-config

+ 19
- 0
src/freedombone View File

@@ -126,6 +126,7 @@ PRIVATE_MAILING_LIST=
126 126
 
127 127
 # Domain name for mediagoblin installation
128 128
 MEDIAGOBLIN_DOMAIN_NAME=
129
+MEDIAGOBLIN_CODE=
129 130
 MEDIAGOBLIN_REPO="https://gitorious.org/mediagoblin/mediagoblin.git"
130 131
 MEDIAGOBLIN_ADMIN_PASSWORD=
131 132
 
@@ -693,6 +694,12 @@ function read_configuration {
693 694
   fi
694 695
 
695 696
   if [ -f $CONFIGURATION_FILE ]; then
697
+      if grep -q "MEDIAGOBLIN_DOMAIN_NAME" $CONFIGURATION_FILE; then
698
+          MEDIAGOBLIN_DOMAIN_NAME=$(grep "MEDIAGOBLIN_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
699
+      fi
700
+      if grep -q "MEDIAGOBLIN_CODE" $CONFIGURATION_FILE; then
701
+          MEDIAGOBLIN_CODE=$(grep "MEDIAGOBLIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
702
+      fi
696 703
       if grep -q "GIT_ADMIN_PASSWORD" $CONFIGURATION_FILE; then
697 704
           GIT_ADMIN_PASSWORD=$(grep "GIT_ADMIN_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
698 705
       fi
@@ -2825,6 +2832,18 @@ function create_freedns_updater {
2825 2832
           echo "$FREEDNS_WGET$MICROBLOG_CODE=" >> /usr/bin/dynamicdns
2826 2833
       fi
2827 2834
   fi
2835
+  if [ $GIT_CODE ]; then
2836
+      if [[ $GIT_CODE != "$DEFAULT_DOMAIN_CODE" ]]; then
2837
+          echo "# $GIT_DOMAIN_NAME" >> /usr/bin/dynamicdns
2838
+          echo "$FREEDNS_WGET$GIT_CODE=" >> /usr/bin/dynamicdns
2839
+      fi
2840
+  fi
2841
+  if [ $MEDIAGOBLIN_CODE ]; then
2842
+      if [[ $MEDIAGOBLIN_CODE != "$DEFAULT_DOMAIN_CODE" ]]; then
2843
+          echo "# $MEDIAGOBLIN_DOMAIN_NAME" >> /usr/bin/dynamicdns
2844
+          echo "$FREEDNS_WGET$MEDIAGOBLIN_CODE=" >> /usr/bin/dynamicdns
2845
+      fi
2846
+  fi
2828 2847
   echo 'exit 0' >> /usr/bin/dynamicdns
2829 2848
   chmod 600 /usr/bin/dynamicdns
2830 2849
   chmod +x /usr/bin/dynamicdns

+ 14
- 0
src/freedombone-config View File

@@ -82,6 +82,8 @@ MICROBLOG_DOMAIN_NAME=
82 82
 MICROBLOG_CODE=
83 83
 GIT_DOMAIN_NAME=
84 84
 GIT_CODE=
85
+MEDIAGOBLIN_DOMAIN_NAME=
86
+MEDIAGOBLIN_CODE=
85 87
 USB_DRIVE=/dev/sdb1
86 88
 
87 89
 CONFIGURATION_FILE=
@@ -206,6 +208,12 @@ function save_configuration_file {
206 208
   if [ $GIT_CODE ]; then
207 209
       echo "GIT_CODE=$GIT_CODE" >> $CONFIGURATION_FILE
208 210
   fi
211
+  if [ $MEDIAGOBLIN_DOMAIN_NAME ]; then
212
+      echo "MEDIAGOBLIN_DOMAIN_NAME=$MEDIAGOBLIN_DOMAIN_NAME" >> $CONFIGURATION_FILE
213
+  fi
214
+  if [ $MEDIAGOBLIN_CODE ]; then
215
+      echo "MEDIAGOBLIN_CODE=$MEDIAGOBLIN_CODE" >> $CONFIGURATION_FILE
216
+  fi
209 217
 }
210 218
 
211 219
 # test a domain name to see if it's valid
@@ -1132,6 +1140,12 @@ function read_configuration {
1132 1140
       if grep -q "MY_BLOG_SUBTITLE" $CONFIGURATION_FILE; then
1133 1141
           MY_BLOG_SUBTITLE=$(grep "MY_BLOG_SUBTITLE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1134 1142
       fi
1143
+      if grep -q "MEDIAGOBLIN_DOMAIN_NAME" $CONFIGURATION_FILE; then
1144
+          MEDIAGOBLIN_DOMAIN_NAME=$(grep "MEDIAGOBLIN_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1145
+      fi
1146
+      if grep -q "MEDIAGOBLIN_CODE" $CONFIGURATION_FILE; then
1147
+          MEDIAGOBLIN_CODE=$(grep "MEDIAGOBLIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1148
+      fi
1135 1149
   fi
1136 1150
 }
1137 1151