|
@@ -529,6 +529,38 @@ function check_hwrng {
|
529
|
529
|
fi
|
530
|
530
|
}
|
531
|
531
|
|
|
532
|
+function get_mariadb_password {
|
|
533
|
+ if [ -f /home/$MY_USERNAME/README ]; then
|
|
534
|
+ if grep -q "MariaDB password" /home/$MY_USERNAME/README; then
|
|
535
|
+ MARIADB_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
|
536
|
+ fi
|
|
537
|
+ fi
|
|
538
|
+}
|
|
539
|
+
|
|
540
|
+function get_mariadb_gnusocial_admin_password {
|
|
541
|
+ if [ -f /home/$MY_USERNAME/README ]; then
|
|
542
|
+ if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then
|
|
543
|
+ MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB gnusocial admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
|
544
|
+ fi
|
|
545
|
+ fi
|
|
546
|
+}
|
|
547
|
+
|
|
548
|
+function get_mariadb_redmatrix_admin_password {
|
|
549
|
+ if [ -f /home/$MY_USERNAME/README ]; then
|
|
550
|
+ if grep -q "MariaDB Red Matrix admin password" /home/$MY_USERNAME/README; then
|
|
551
|
+ REDMATRIX_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB Red Matrix admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
|
552
|
+ fi
|
|
553
|
+ fi
|
|
554
|
+}
|
|
555
|
+
|
|
556
|
+function get_mariadb_owncloud_admin_password {
|
|
557
|
+ if [ -f /home/$MY_USERNAME/README ]; then
|
|
558
|
+ if grep -q "Owncloud database password" /home/$MY_USERNAME/README; then
|
|
559
|
+ OWNCLOUD_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "Owncloud database password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
|
560
|
+ fi
|
|
561
|
+ fi
|
|
562
|
+}
|
|
563
|
+
|
532
|
564
|
# For rsyncrypto usage see http://archive09.linux.com/feature/125322
|
533
|
565
|
function create_backup_script {
|
534
|
566
|
if grep -Fxq "create_backup_script" $COMPLETION_FILE; then
|
|
@@ -536,6 +568,11 @@ function create_backup_script {
|
536
|
568
|
fi
|
537
|
569
|
apt-get -y --force-yes install rsyncrypto
|
538
|
570
|
|
|
571
|
+ get_mariadb_password
|
|
572
|
+ get_mariadb_gnusocial_admin_password
|
|
573
|
+ get_mariadb_redmatrix_admin_password
|
|
574
|
+ get_mariadb_owncloud_admin_password
|
|
575
|
+
|
539
|
576
|
echo '#!/bin/bash' > /usr/bin/$BACKUP_SCRIPT_NAME
|
540
|
577
|
echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
541
|
578
|
echo "if [ ! -b $USB_DRIVE ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
@@ -583,6 +620,9 @@ function create_backup_script {
|
583
|
620
|
echo "mysqldump --password=$MARIADB_PASSWORD gnusocial > $USB_MOUNT/backup/gnusocial.sql" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
584
|
621
|
echo "if [ ! -s $USB_MOUNT/backup/gnusocial.sql ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
585
|
622
|
echo ' echo "GNU social database could not be saved"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
623
|
+ echo " if [ ! $MARIADB_PASSWORD ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
624
|
+ echo " echo 'No MariaDB password was given'" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
625
|
+ echo " fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
586
|
626
|
echo ' exit 379' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
587
|
627
|
echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
588
|
628
|
echo 'echo "Backing up GNU social installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
@@ -596,6 +636,9 @@ function create_backup_script {
|
596
|
636
|
echo "mysqldump --password=$MARIADB_PASSWORD redmatrix > $USB_MOUNT/backup/redmatrix.sql" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
597
|
637
|
echo "if [ ! -s $USB_MOUNT/backup/redmatrix.sql ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
598
|
638
|
echo ' echo "Red Matrix database could not be saved"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
639
|
+ echo " if [ ! $MARIADB_PASSWORD ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
640
|
+ echo " echo 'No MariaDB password was given'" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
641
|
+ echo " fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
599
|
642
|
echo ' exit 378' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
600
|
643
|
echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
601
|
644
|
echo 'echo "Backing up Red Matrix installation"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
@@ -608,6 +651,9 @@ function create_backup_script {
|
608
|
651
|
echo "mysqldump --password=$MARIADB_PASSWORD owncloud > $USB_MOUNT/backup/owncloud.sql" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
609
|
652
|
echo "if [ ! -s $USB_MOUNT/backup/owncloud.sql ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
610
|
653
|
echo ' echo "Owncloud database could not be saved"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
654
|
+ echo " if [ ! $MARIADB_PASSWORD ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
655
|
+ echo " echo 'No MariaDB password was given'" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
656
|
+ echo " fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
611
|
657
|
echo ' exit 377' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
612
|
658
|
echo "fi" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
613
|
659
|
echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
@@ -905,6 +951,11 @@ function backup_to_friends_servers {
|
905
|
951
|
|
906
|
952
|
apt-get -y --force-yes install duplicity
|
907
|
953
|
|
|
954
|
+ get_mariadb_password
|
|
955
|
+ get_mariadb_gnusocial_admin_password
|
|
956
|
+ get_mariadb_redmatrix_admin_password
|
|
957
|
+ get_mariadb_owncloud_admin_password
|
|
958
|
+
|
908
|
959
|
if ! grep -q "backups on friends servers" /home/$MY_USERNAME/README; then
|
909
|
960
|
echo '' >> /home/$MY_USERNAME/README
|
910
|
961
|
echo '' >> /home/$MY_USERNAME/README
|
|
@@ -3339,38 +3390,6 @@ function configure_php {
|
3339
|
3390
|
sed -i "s/post_max_size = 8M/post_max_size = 50M/g" /etc/php5/fpm/php.ini
|
3340
|
3391
|
}
|
3341
|
3392
|
|
3342
|
|
-function get_mariadb_password {
|
3343
|
|
- if [ -f /home/$MY_USERNAME/README ]; then
|
3344
|
|
- if grep -q "MariaDB password" /home/$MY_USERNAME/README; then
|
3345
|
|
- MARIADB_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
3346
|
|
- fi
|
3347
|
|
- fi
|
3348
|
|
-}
|
3349
|
|
-
|
3350
|
|
-function get_mariadb_gnusocial_admin_password {
|
3351
|
|
- if [ -f /home/$MY_USERNAME/README ]; then
|
3352
|
|
- if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then
|
3353
|
|
- MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB gnusocial admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
3354
|
|
- fi
|
3355
|
|
- fi
|
3356
|
|
-}
|
3357
|
|
-
|
3358
|
|
-function get_mariadb_redmatrix_admin_password {
|
3359
|
|
- if [ -f /home/$MY_USERNAME/README ]; then
|
3360
|
|
- if grep -q "MariaDB Red Matrix admin password" /home/$MY_USERNAME/README; then
|
3361
|
|
- REDMATRIX_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB Red Matrix admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
3362
|
|
- fi
|
3363
|
|
- fi
|
3364
|
|
-}
|
3365
|
|
-
|
3366
|
|
-function get_mariadb_owncloud_admin_password {
|
3367
|
|
- if [ -f /home/$MY_USERNAME/README ]; then
|
3368
|
|
- if grep -q "Owncloud database password" /home/$MY_USERNAME/README; then
|
3369
|
|
- OWNCLOUD_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "Owncloud database password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
3370
|
|
- fi
|
3371
|
|
- fi
|
3372
|
|
-}
|
3373
|
|
-
|
3374
|
3393
|
function install_mariadb {
|
3375
|
3394
|
if grep -Fxq "install_mariadb" $COMPLETION_FILE; then
|
3376
|
3395
|
return
|