From 35eb67a9430328989c693e9ed933adb275b27e41 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 18 Dec 2017 19:04:34 +0000 Subject: [PATCH] Disable install of the federated wiki for now. It requires a proprietary identity provider to log in, and without that the wiki is read only. An independent identity provider needs to be implemented within https://github.com/fedwiki/wiki-security-passportjs #69 --- src/freedombone-app-fedwiki | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/freedombone-app-fedwiki b/src/freedombone-app-fedwiki index 1fe8e64d..d7834de7 100755 --- a/src/freedombone-app-fedwiki +++ b/src/freedombone-app-fedwiki @@ -28,7 +28,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -VARIANTS="full full-vim media" +VARIANTS="" IN_DEFAULT_INSTALL=0 SHOW_ON_ABOUT=1 @@ -395,6 +395,9 @@ function install_fedwiki { FEDWIKI_ONION_HOSTNAME=$(add_onion_service fedwiki 80 ${FEDWIKI_ONION_PORT}) + #TODO add a config file for the identity system + # $FEDWIKI_DATA/config.json + echo '[Unit]' > /etc/systemd/system/fedwiki.service echo 'Description=Fedwiki Decentralized video streaming platform' >> /etc/systemd/system/fedwiki.service echo 'After=syslog.target' >> /etc/systemd/system/fedwiki.service @@ -404,7 +407,7 @@ function install_fedwiki { echo 'User=fedwiki' >> /etc/systemd/system/fedwiki.service echo 'Group=fedwiki' >> /etc/systemd/system/fedwiki.service echo "WorkingDirectory=/usr/local/lib/node_modules/wiki" >> /etc/systemd/system/fedwiki.service - echo "ExecStart=/usr/local/bin/wiki --data $FEDWIKI_DATA -p $FEDWIKI_PORT" >> /etc/systemd/system/fedwiki.service + echo "ExecStart=/usr/local/bin/wiki --config $FEDWIKI_DATA/config.json --data $FEDWIKI_DATA -p $FEDWIKI_PORT" >> /etc/systemd/system/fedwiki.service echo 'StandardOutput=syslog' >> /etc/systemd/system/fedwiki.service echo 'StandardError=syslog' >> /etc/systemd/system/fedwiki.service echo 'SyslogIdentifier=fedwiki' >> /etc/systemd/system/fedwiki.service