|
@@ -3207,6 +3207,7 @@ function random_number_generator {
|
3207
|
3207
|
else
|
3208
|
3208
|
apt-get -y --force-yes install haveged
|
3209
|
3209
|
fi
|
|
3210
|
+
|
3210
|
3211
|
echo 'random_number_generator' >> $COMPLETION_FILE
|
3211
|
3212
|
}
|
3212
|
3213
|
|
|
@@ -4823,6 +4824,11 @@ function install_mariadb {
|
4823
|
4824
|
if grep -Fxq "install_mariadb" $COMPLETION_FILE; then
|
4824
|
4825
|
return
|
4825
|
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
|
4832
|
apt-get -y --force-yes install python-software-properties debconf-utils
|
4827
|
4833
|
apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
|
4828
|
4834
|
add-apt-repository 'deb http://mariadb.biz.net.id//repo/10.1/debian sid main'
|
|
@@ -4987,6 +4993,10 @@ function install_owncloud {
|
4987
|
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
|
4994
|
return
|
4989
|
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
|
5000
|
OWNCLOUD_COMPLETION_MSG1=" *** Freedombone $SYSTEM_TYPE is now installed ***"
|
4991
|
5001
|
OWNCLOUD_COMPLETION_MSG2="Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup"
|
4992
|
5002
|
if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
|
|
@@ -5236,6 +5246,10 @@ function install_xmpp {
|
5236
|
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
|
5247
|
return
|
5238
|
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
|
5253
|
if grep -Fxq "install_xmpp" $COMPLETION_FILE; then
|
5240
|
5254
|
return
|
5241
|
5255
|
fi
|
|
@@ -5334,6 +5348,10 @@ function install_irc_server {
|
5334
|
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
|
5349
|
return
|
5336
|
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
|
5355
|
if grep -Fxq "install_irc_server" $COMPLETION_FILE; then
|
5338
|
5356
|
return
|
5339
|
5357
|
fi
|
|
@@ -5414,6 +5432,10 @@ function install_wiki {
|
5414
|
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
|
5433
|
return
|
5416
|
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
|
5439
|
if grep -Fxq "install_wiki" $COMPLETION_FILE; then
|
5418
|
5440
|
return
|
5419
|
5441
|
fi
|
|
@@ -5702,6 +5724,10 @@ function install_blog {
|
5702
|
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
|
5725
|
return
|
5704
|
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
|
5731
|
if grep -Fxq "install_blog" $COMPLETION_FILE; then
|
5706
|
5732
|
return
|
5707
|
5733
|
fi
|
|
@@ -5950,6 +5976,10 @@ function install_gnu_social {
|
5950
|
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
|
5977
|
return
|
5952
|
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
|
5983
|
if [ ! $MICROBLOG_DOMAIN_NAME ]; then
|
5954
|
5984
|
return
|
5955
|
5985
|
fi
|
|
@@ -6199,6 +6229,10 @@ function install_redmatrix {
|
6199
|
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
|
6230
|
return
|
6201
|
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
|
6236
|
# if this is exclusively a social setup
|
6203
|
6237
|
if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then
|
6204
|
6238
|
REDMATRIX_DOMAIN_NAME=$DOMAIN_NAME
|
|
@@ -7090,6 +7124,10 @@ function enable_wifi_hotspot {
|
7090
|
7124
|
if [[ $ENABLE_WIFI_HOTSPOT != "yes" ]]; then
|
7091
|
7125
|
return
|
7092
|
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
|
7131
|
apt-get -y install hostapd dnsmasq
|
7094
|
7132
|
|
7095
|
7133
|
get_wifi_essid
|
|
@@ -7177,6 +7215,11 @@ function enable_wifi {
|
7177
|
7215
|
if [[ $ENABLE_WIFI != "yes" || $ENABLE_WIFI_HOTSPOT != "yes" ]]; then
|
7178
|
7216
|
return
|
7179
|
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
|
7223
|
sed -i 's/#auto wlan0/auto wlan0/g' /etc/network/interfaces
|
7181
|
7224
|
sed -i 's/#iface wlan0 inet dhcp/iface wlan0 inet dhcp/g' /etc/network/interfaces
|
7182
|
7225
|
sed -i 's/# wpa-ssid "essid"/ wpa-ssid "essid"/g' /etc/network/interfaces
|