|
@@ -53,6 +53,35 @@ SHARINGS_THEME_COMMIT='7106c7ef03'
|
53
|
53
|
GNUSOCIAL_NSFW_REPO="https://gitgud.io/ShitposterClub/SensitiveContent"
|
54
|
54
|
GNUSOCIAL_NSFW_COMMIT='a096bbe0cfae9a9b177682920ffb58d32a48e136'
|
55
|
55
|
|
|
56
|
+function get_mariadb_gnusocial_admin_password {
|
|
57
|
+ if [ -f /home/$MY_USERNAME/README ]; then
|
|
58
|
+ if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then
|
|
59
|
+ MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB gnusocial admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
|
60
|
+ fi
|
|
61
|
+ if grep -q "Microblog administrator password" /home/$MY_USERNAME/README; then
|
|
62
|
+ MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "Microblog administrator password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
|
63
|
+ fi
|
|
64
|
+ fi
|
|
65
|
+}
|
|
66
|
+
|
|
67
|
+function gnusocial_create_database {
|
|
68
|
+ function_check get_mariadb_gnusocial_admin_password
|
|
69
|
+ get_mariadb_gnusocial_admin_password
|
|
70
|
+ if [ ! $MICROBLOG_ADMIN_PASSWORD ]; then
|
|
71
|
+ if [ -f $IMAGE_PASSWORD_FILE ]; then
|
|
72
|
+ MICROBLOG_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
|
|
73
|
+ else
|
|
74
|
+ MICROBLOG_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
|
|
75
|
+ fi
|
|
76
|
+ fi
|
|
77
|
+ if [ ! $MICROBLOG_ADMIN_PASSWORD ]; then
|
|
78
|
+ return
|
|
79
|
+ fi
|
|
80
|
+
|
|
81
|
+ function_check create_database
|
|
82
|
+ create_database gnusocial "$MICROBLOG_ADMIN_PASSWORD" $MY_USERNAME
|
|
83
|
+}
|
|
84
|
+
|
56
|
85
|
function gnusocial_running_script {
|
57
|
86
|
if ! grep -Fxq "install_gnusocial" $COMPLETION_FILE; then
|
58
|
87
|
return
|
|
@@ -130,6 +159,9 @@ function restore_local_gnusocial {
|
130
|
159
|
cd $gnusocial_dir
|
131
|
160
|
scripts/stopdaemons.sh
|
132
|
161
|
|
|
162
|
+ function_check gnusocial_create_database
|
|
163
|
+ gnusocial_create_database
|
|
164
|
+
|
133
|
165
|
restore_database gnusocial ${MICROBLOG_DOMAIN_NAME}
|
134
|
166
|
if [ -d $temp_restore_dir ]; then
|
135
|
167
|
rm -rf $temp_restore_dir
|
|
@@ -175,6 +207,9 @@ function restore_remote_gnusocial {
|
175
|
207
|
cd /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs
|
176
|
208
|
scripts/stopdaemons.sh
|
177
|
209
|
|
|
210
|
+ function_check gnusocial_create_database
|
|
211
|
+ gnusocial_create_database
|
|
212
|
+
|
178
|
213
|
function_check restore_database_from_friend
|
179
|
214
|
restore_database_from_friend gnusocial ${MICROBLOG_DOMAIN_NAME}
|
180
|
215
|
if [ -d /root/tempgnusocial ]; then
|
|
@@ -256,18 +291,8 @@ function install_gnusocial_main {
|
256
|
291
|
chown www-data:www-data /var/www/$MICROBLOG_DOMAIN_NAME/htdocs
|
257
|
292
|
chmod +x /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/scripts/maildaemon.php
|
258
|
293
|
|
259
|
|
- function_check get_mariadb_gnusocial_admin_password
|
260
|
|
- get_mariadb_gnusocial_admin_password
|
261
|
|
- if [ ! $MICROBLOG_ADMIN_PASSWORD ]; then
|
262
|
|
- if [ -f $IMAGE_PASSWORD_FILE ]; then
|
263
|
|
- MICROBLOG_ADMIN_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
|
264
|
|
- else
|
265
|
|
- MICROBLOG_ADMIN_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
|
266
|
|
- fi
|
267
|
|
- fi
|
268
|
|
-
|
269
|
|
- function_check create_database
|
270
|
|
- create_database gnusocial "$MICROBLOG_ADMIN_PASSWORD" $MY_USERNAME
|
|
294
|
+ function_check gnusocial_create_database
|
|
295
|
+ gnusocial_create_database
|
271
|
296
|
|
272
|
297
|
if [ ! -f "/etc/aliases" ]; then
|
273
|
298
|
touch /etc/aliases
|