Browse Source

Check that random number generator is initialised before creating random passwords

Bob Mottram 10 years ago
parent
commit
f652d20e55
1 changed files with 43 additions and 0 deletions
  1. 43
    0
      install-freedombone.sh

+ 43
- 0
install-freedombone.sh View File

3207
   else
3207
   else
3208
     apt-get -y --force-yes install haveged
3208
     apt-get -y --force-yes install haveged
3209
   fi
3209
   fi
3210
+
3210
   echo 'random_number_generator' >> $COMPLETION_FILE
3211
   echo 'random_number_generator' >> $COMPLETION_FILE
3211
 }
3212
 }
3212
 
3213
 
4823
   if grep -Fxq "install_mariadb" $COMPLETION_FILE; then
4824
   if grep -Fxq "install_mariadb" $COMPLETION_FILE; then
4824
       return
4825
       return
4825
   fi
4826
   fi
4827
+  if ! grep -Fxq "random_number_generator" $COMPLETION_FILE; then
4828
+      echo 'install_mariadb was called before the random number generator was initialised'
4829
+      exit 853
4830
+  fi
4831
+
4826
   apt-get -y --force-yes install python-software-properties debconf-utils
4832
   apt-get -y --force-yes install python-software-properties debconf-utils
4827
   apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
4833
   apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
4828
   add-apt-repository 'deb http://mariadb.biz.net.id//repo/10.1/debian sid main'
4834
   add-apt-repository 'deb http://mariadb.biz.net.id//repo/10.1/debian sid main'
4987
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
4993
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
4988
       return
4994
       return
4989
   fi
4995
   fi
4996
+  if ! grep -Fxq "random_number_generator" $COMPLETION_FILE; then
4997
+      echo 'install_owncloud was called before the random number generator was initialised'
4998
+      exit 853
4999
+  fi
4990
   OWNCLOUD_COMPLETION_MSG1=" *** Freedombone $SYSTEM_TYPE is now installed ***"
5000
   OWNCLOUD_COMPLETION_MSG1=" *** Freedombone $SYSTEM_TYPE is now installed ***"
4991
   OWNCLOUD_COMPLETION_MSG2="Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup"
5001
   OWNCLOUD_COMPLETION_MSG2="Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup"
4992
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
5002
   if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
5236
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
5246
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
5237
       return
5247
       return
5238
   fi
5248
   fi
5249
+  if ! grep -Fxq "random_number_generator" $COMPLETION_FILE; then
5250
+      echo 'install_xmpp was called before the random number generator was initialised'
5251
+      exit 853
5252
+  fi
5239
   if grep -Fxq "install_xmpp" $COMPLETION_FILE; then
5253
   if grep -Fxq "install_xmpp" $COMPLETION_FILE; then
5240
       return
5254
       return
5241
   fi
5255
   fi
5334
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
5348
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
5335
       return
5349
       return
5336
   fi
5350
   fi
5351
+  if ! grep -Fxq "random_number_generator" $COMPLETION_FILE; then
5352
+      echo 'install_irc_server was called before the random number generator was initialised'
5353
+      exit 853
5354
+  fi
5337
   if grep -Fxq "install_irc_server" $COMPLETION_FILE; then
5355
   if grep -Fxq "install_irc_server" $COMPLETION_FILE; then
5338
       return
5356
       return
5339
   fi
5357
   fi
5414
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
5432
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
5415
       return
5433
       return
5416
   fi
5434
   fi
5435
+  if ! grep -Fxq "random_number_generator" $COMPLETION_FILE; then
5436
+      echo 'install_wiki was called before the random number generator was initialised'
5437
+      exit 853
5438
+  fi
5417
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
5439
   if grep -Fxq "install_wiki" $COMPLETION_FILE; then
5418
       return
5440
       return
5419
   fi
5441
   fi
5702
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
5724
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
5703
       return
5725
       return
5704
   fi
5726
   fi
5727
+  if ! grep -Fxq "random_number_generator" $COMPLETION_FILE; then
5728
+      echo 'install_blog was called before the random number generator was initialised'
5729
+      exit 853
5730
+  fi
5705
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
5731
   if grep -Fxq "install_blog" $COMPLETION_FILE; then
5706
       return
5732
       return
5707
   fi
5733
   fi
5950
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
5976
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
5951
       return
5977
       return
5952
   fi
5978
   fi
5979
+  if ! grep -Fxq "random_number_generator" $COMPLETION_FILE; then
5980
+      echo 'install_gnu_social was called before the random number generator was initialised'
5981
+      exit 853
5982
+  fi
5953
   if [ ! $MICROBLOG_DOMAIN_NAME ]; then
5983
   if [ ! $MICROBLOG_DOMAIN_NAME ]; then
5954
       return
5984
       return
5955
   fi
5985
   fi
6199
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
6229
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" || $SYSTEM_TYPE == "$VARIANT_TOR_WIFI" ]]; then
6200
       return
6230
       return
6201
   fi
6231
   fi
6232
+  if ! grep -Fxq "random_number_generator" $COMPLETION_FILE; then
6233
+      echo 'install_redmatrix was called before the random number generator was initialised'
6234
+      exit 853
6235
+  fi
6202
   # if this is exclusively a social setup
6236
   # if this is exclusively a social setup
6203
   if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then
6237
   if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then
6204
       REDMATRIX_DOMAIN_NAME=$DOMAIN_NAME
6238
       REDMATRIX_DOMAIN_NAME=$DOMAIN_NAME
7090
   if [[ $ENABLE_WIFI_HOTSPOT != "yes" ]]; then
7124
   if [[ $ENABLE_WIFI_HOTSPOT != "yes" ]]; then
7091
       return
7125
       return
7092
   fi
7126
   fi
7127
+  if ! grep -Fxq "random_number_generator" $COMPLETION_FILE; then
7128
+      echo 'enable_wifi_hotspot was called before the random number generator was initialised'
7129
+      exit 853
7130
+  fi
7093
   apt-get -y install hostapd dnsmasq
7131
   apt-get -y install hostapd dnsmasq
7094
 
7132
 
7095
   get_wifi_essid
7133
   get_wifi_essid
7177
   if [[ $ENABLE_WIFI != "yes" || $ENABLE_WIFI_HOTSPOT != "yes" ]]; then
7215
   if [[ $ENABLE_WIFI != "yes" || $ENABLE_WIFI_HOTSPOT != "yes" ]]; then
7178
       return
7216
       return
7179
   fi
7217
   fi
7218
+  if ! grep -Fxq "random_number_generator" $COMPLETION_FILE; then
7219
+      echo 'enable_wifi was called before the random number generator was initialised'
7220
+      exit 853
7221
+  fi
7222
+
7180
   sed -i 's/#auto wlan0/auto wlan0/g' /etc/network/interfaces
7223
   sed -i 's/#auto wlan0/auto wlan0/g' /etc/network/interfaces
7181
   sed -i 's/#iface wlan0 inet dhcp/iface wlan0 inet dhcp/g' /etc/network/interfaces
7224
   sed -i 's/#iface wlan0 inet dhcp/iface wlan0 inet dhcp/g' /etc/network/interfaces
7182
   sed -i 's/#    wpa-ssid "essid"/    wpa-ssid "essid"/g' /etc/network/interfaces
7225
   sed -i 's/#    wpa-ssid "essid"/    wpa-ssid "essid"/g' /etc/network/interfaces