From 7d5724e082a3a5dcc4cdac87f386081faae7b2b2 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 4 Jan 2018 18:43:56 +0000 Subject: [PATCH] Re-enable fedwiki for another test --- src/freedombone-app-fedwiki | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/freedombone-app-fedwiki b/src/freedombone-app-fedwiki index 8be46f34..fb007bbc 100755 --- a/src/freedombone-app-fedwiki +++ b/src/freedombone-app-fedwiki @@ -16,7 +16,7 @@ # License # ======= # -# Copyright (C) 2017 Bob Mottram +# Copyright (C) 2017-2018 Bob Mottram # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -31,7 +31,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -VARIANTS="" +VARIANTS='full full-vim writer' IN_DEFAULT_INSTALL=0 SHOW_ON_ABOUT=1 @@ -444,14 +444,20 @@ function install_fedwiki { echo '[Install]' >> /etc/systemd/system/fedwiki.service echo 'WantedBy=multi-user.target' >> /etc/systemd/system/fedwiki.service + fedwiki_auth_file=${FEDWIKI_DATA}/status/owner.json + echo '{' > $fedwiki_auth_file + echo " \"name\": \"${MY_USERNAME}\"," >> $fedwiki_auth_file + echo ' \"friend\": {' >> $fedwiki_auth_file + echo " \"secret\": \"${FEDWIKI_COOKIE}\"" >> $fedwiki_auth_file + echo ' }' >> $fedwiki_auth_file + echo '}' >> $fedwiki_auth_file + chown -R fedwiki:fedwiki $FEDWIKI_DATA fedwiki_setup_web ${PROJECT_NAME}-pass -u $MY_USERNAME -a fedwiki -p "$FEDWIKI_ADMIN_PASSWORD" - fedwiki_auth_file=/var/lib/fedwiki/status/owner.json - function_check add_ddns_domain add_ddns_domain $FEDWIKI_DOMAIN_NAME