Przeglądaj źródła

Re-enable fedwiki for another test

Bob Mottram 7 lat temu
rodzic
commit
7d5724e082
1 zmienionych plików z 10 dodań i 4 usunięć
  1. 10
    4
      src/freedombone-app-fedwiki

+ 10
- 4
src/freedombone-app-fedwiki Wyświetl plik

@@ -16,7 +16,7 @@
16 16
 # License
17 17
 # =======
18 18
 #
19
-# Copyright (C) 2017 Bob Mottram <bob@freedombone.net>
19
+# Copyright (C) 2017-2018 Bob Mottram <bob@freedombone.net>
20 20
 #
21 21
 # This program is free software: you can redistribute it and/or modify
22 22
 # it under the terms of the GNU Affero General Public License as published by
@@ -31,7 +31,7 @@
31 31
 # You should have received a copy of the GNU Affero General Public License
32 32
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
33 33
 
34
-VARIANTS=""
34
+VARIANTS='full full-vim writer'
35 35
 
36 36
 IN_DEFAULT_INSTALL=0
37 37
 SHOW_ON_ABOUT=1
@@ -444,14 +444,20 @@ function install_fedwiki {
444 444
     echo '[Install]' >> /etc/systemd/system/fedwiki.service
445 445
     echo 'WantedBy=multi-user.target' >> /etc/systemd/system/fedwiki.service
446 446
 
447
+    fedwiki_auth_file=${FEDWIKI_DATA}/status/owner.json
448
+    echo '{' > $fedwiki_auth_file
449
+    echo "  \"name\": \"${MY_USERNAME}\"," >> $fedwiki_auth_file
450
+    echo '  \"friend\": {' >> $fedwiki_auth_file
451
+    echo "    \"secret\": \"${FEDWIKI_COOKIE}\"" >> $fedwiki_auth_file
452
+    echo '  }' >> $fedwiki_auth_file
453
+    echo '}' >> $fedwiki_auth_file
454
+
447 455
     chown -R fedwiki:fedwiki $FEDWIKI_DATA
448 456
 
449 457
     fedwiki_setup_web
450 458
 
451 459
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a fedwiki -p "$FEDWIKI_ADMIN_PASSWORD"
452 460
 
453
-    fedwiki_auth_file=/var/lib/fedwiki/status/owner.json
454
-
455 461
     function_check add_ddns_domain
456 462
     add_ddns_domain $FEDWIKI_DOMAIN_NAME
457 463