Bladeren bron

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

Bob Mottram 7 jaren geleden
bovenliggende
commit
35eb67a943
1 gewijzigde bestanden met toevoegingen van 5 en 2 verwijderingen
  1. 5
    2
      src/freedombone-app-fedwiki

+ 5
- 2
src/freedombone-app-fedwiki Bestand weergeven

@@ -28,7 +28,7 @@
28 28
 # You should have received a copy of the GNU Affero General Public License
29 29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
30 30
 
31
-VARIANTS="full full-vim media"
31
+VARIANTS=""
32 32
 
33 33
 IN_DEFAULT_INSTALL=0
34 34
 SHOW_ON_ABOUT=1
@@ -395,6 +395,9 @@ function install_fedwiki {
395 395
 
396 396
     FEDWIKI_ONION_HOSTNAME=$(add_onion_service fedwiki 80 ${FEDWIKI_ONION_PORT})
397 397
 
398
+    #TODO add a config file for the identity system
399
+    # $FEDWIKI_DATA/config.json
400
+
398 401
     echo '[Unit]' > /etc/systemd/system/fedwiki.service
399 402
     echo 'Description=Fedwiki Decentralized video streaming platform' >> /etc/systemd/system/fedwiki.service
400 403
     echo 'After=syslog.target' >> /etc/systemd/system/fedwiki.service
@@ -404,7 +407,7 @@ function install_fedwiki {
404 407
     echo 'User=fedwiki' >> /etc/systemd/system/fedwiki.service
405 408
     echo 'Group=fedwiki' >> /etc/systemd/system/fedwiki.service
406 409
     echo "WorkingDirectory=/usr/local/lib/node_modules/wiki" >> /etc/systemd/system/fedwiki.service
407
-    echo "ExecStart=/usr/local/bin/wiki --data $FEDWIKI_DATA -p $FEDWIKI_PORT" >> /etc/systemd/system/fedwiki.service
410
+    echo "ExecStart=/usr/local/bin/wiki --config $FEDWIKI_DATA/config.json --data $FEDWIKI_DATA -p $FEDWIKI_PORT" >> /etc/systemd/system/fedwiki.service
408 411
     echo 'StandardOutput=syslog' >> /etc/systemd/system/fedwiki.service
409 412
     echo 'StandardError=syslog' >> /etc/systemd/system/fedwiki.service
410 413
     echo 'SyslogIdentifier=fedwiki' >> /etc/systemd/system/fedwiki.service