|
@@ -169,7 +169,6 @@ WIKI_FREEDNS_SUBDOMAIN_CODE=
|
169
|
169
|
WIKI_ARCHIVE="dokuwiki-stable.tgz"
|
170
|
170
|
WIKI_DOWNLOAD="http://download.dokuwiki.org/src/dokuwiki/$WIKI_ARCHIVE"
|
171
|
171
|
WIKI_HASH="941b6954d39de57530efbb27d0734b6bc9a49aaa3c781b39f6ecb305322534eb"
|
172
|
|
-WIKI_INSTALLED="no"
|
173
|
172
|
|
174
|
173
|
# see https://www.dokuwiki.org/template:mnml-blog
|
175
|
174
|
# https://andreashaerter.com/tmp/downloads/dokuwiki-template-mnml-blog/CHECKSUMS.asc
|
|
@@ -502,7 +501,7 @@ function create_backup_script {
|
502
|
501
|
echo 'echo "Obtaining Owncloud data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
503
|
502
|
echo "tar -czvf /home/$MY_USERNAME/tempfiles/owncloud.tar.gz /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs/data/$MY_USERNAME" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
504
|
503
|
fi
|
505
|
|
- if [[ $WIKI_INSTALLED == "yes" ]]; then
|
|
504
|
+ if grep -Fxq "install_wiki" $COMPLETION_FILE; then
|
506
|
505
|
echo 'echo "Obtaining wiki data backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
507
|
506
|
echo "tar -czvf /home/$MY_USERNAME/tempfiles/wiki.tar.gz /var/www/$WIKI_DOMAIN_NAME/htdocs/data" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
508
|
507
|
fi
|
|
@@ -671,7 +670,7 @@ function create_restore_script {
|
671
|
670
|
echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
672
|
671
|
fi
|
673
|
672
|
|
674
|
|
- if [[ $WIKI_INSTALLED == "yes" ]]; then
|
|
673
|
+ if grep -Fxq "install_wiki" $COMPLETION_FILE; then
|
675
|
674
|
echo "if [ -f /home/$MY_USERNAME/tempfiles/wiki.tar.gz ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
676
|
675
|
echo ' echo "Restoring Wiki / Blog"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
677
|
676
|
echo " tar -xzvf /home/$MY_USERNAME/tempfiles/wiki.tar.gz -C /" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
@@ -768,7 +767,7 @@ function backup_to_friends_servers {
|
768
|
767
|
if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
|
769
|
768
|
echo "tar -czvf /home/$MY_USERNAME/tempfiles/owncloud.tar.gz /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs/data/$MY_USERNAME" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
770
|
769
|
fi
|
771
|
|
- if [[ $WIKI_INSTALLED == "yes" ]]; then
|
|
770
|
+ if grep -Fxq "install_wiki" $COMPLETION_FILE; then
|
772
|
771
|
echo "tar -czvf /home/$MY_USERNAME/tempfiles/wiki.tar.gz /var/www/$WIKI_DOMAIN_NAME/htdocs/data" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
773
|
772
|
fi
|
774
|
773
|
echo "tar -czvf /home/$MY_USERNAME/tempfiles/miscfiles.tar.gz /home/$MY_USERNAME/.gnupg /home/$MY_USERNAME/.muttrc /home/$MY_USERNAME/.procmailrc /home/$MY_USERNAME/.ssh /home/$MY_USERNAME/personal" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
@@ -956,7 +955,7 @@ function restore_from_friend {
|
956
|
955
|
echo 'fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
957
|
956
|
fi
|
958
|
957
|
|
959
|
|
- if [[ $WIKI_INSTALLED == "yes" ]]; then
|
|
958
|
+ if grep -Fxq "install_wiki" $COMPLETION_FILE; then
|
960
|
959
|
echo "if [ -f /home/$MY_USERNAME/tempfiles/wiki.tar.gz ]; then" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
961
|
960
|
echo ' echo "Restoring Wiki / Blog"' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
962
|
961
|
echo " tar -xzvf /home/$MY_USERNAME/tempfiles/wiki.tar.gz -C /" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
|
@@ -3440,7 +3439,6 @@ function install_wiki {
|
3440
|
3439
|
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
|
3441
|
3440
|
fi
|
3442
|
3441
|
|
3443
|
|
- WIKI_INSTALLED="yes"
|
3444
|
3442
|
echo 'install_wiki' >> $COMPLETION_FILE
|
3445
|
3443
|
}
|
3446
|
3444
|
|