|
|
@@ -10,6 +10,9 @@
|
|
10
|
10
|
#
|
|
11
|
11
|
# Federated wiki
|
|
12
|
12
|
#
|
|
|
13
|
+# The wiki itself looks ok, but there is no straightforward way for a
|
|
|
14
|
+# user to authenticate which isn't proprietary
|
|
|
15
|
+#
|
|
13
|
16
|
# License
|
|
14
|
17
|
# =======
|
|
15
|
18
|
#
|
|
|
@@ -28,7 +31,7 @@
|
|
28
|
31
|
# You should have received a copy of the GNU Affero General Public License
|
|
29
|
32
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
30
|
33
|
|
|
31
|
|
-VARIANTS="full full-vim media"
|
|
|
34
|
+VARIANTS=""
|
|
32
|
35
|
|
|
33
|
36
|
IN_DEFAULT_INSTALL=0
|
|
34
|
37
|
SHOW_ON_ABOUT=1
|
|
|
@@ -262,6 +265,7 @@ function remove_fedwiki {
|
|
262
|
265
|
rm /etc/systemd/system/fedwiki.service
|
|
263
|
266
|
systemctl daemon-reload
|
|
264
|
267
|
|
|
|
268
|
+ npm uninstall -g wiki-security-friends
|
|
265
|
269
|
npm uninstall -g wiki
|
|
266
|
270
|
|
|
267
|
271
|
function_check remove_nodejs
|
|
|
@@ -399,6 +403,12 @@ function install_fedwiki {
|
|
399
|
403
|
exit 6293523
|
|
400
|
404
|
fi
|
|
401
|
405
|
|
|
|
406
|
+ npm install -g wiki-security-friends@0.1.0
|
|
|
407
|
+ if [ ! "$?" = "0" ]; then
|
|
|
408
|
+ echo $'Failed to install wiki-security-friends'
|
|
|
409
|
+ exit 783533
|
|
|
410
|
+ fi
|
|
|
411
|
+
|
|
402
|
412
|
if [ ! -f /usr/local/bin/wiki ]; then
|
|
403
|
413
|
echo $'wiki was not installed'
|
|
404
|
414
|
exit 5293524
|
|
|
@@ -440,6 +450,8 @@ function install_fedwiki {
|
|
440
|
450
|
|
|
441
|
451
|
${PROJECT_NAME}-pass -u $MY_USERNAME -a fedwiki -p "$FEDWIKI_ADMIN_PASSWORD"
|
|
442
|
452
|
|
|
|
453
|
+ fedwiki_auth_file=/var/lib/fedwiki/status/owner.json
|
|
|
454
|
+
|
|
443
|
455
|
function_check add_ddns_domain
|
|
444
|
456
|
add_ddns_domain $FEDWIKI_DOMAIN_NAME
|
|
445
|
457
|
|
Bob Mottram
7 年前