From 2cc5b6987eb2eb7e8ea8f6fbe0a2493347fbc33f Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 5 Jan 2018 18:38:00 +0000 Subject: [PATCH] Enable font-awesome with fedwiki --- src/freedombone-app-fedwiki | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/freedombone-app-fedwiki b/src/freedombone-app-fedwiki index a08064f7..866cb350 100755 --- a/src/freedombone-app-fedwiki +++ b/src/freedombone-app-fedwiki @@ -54,8 +54,15 @@ fedwiki_variables=(FEDWIKI_DOMAIN_NAME MY_EMAIL_ADDRESS) function fedwiki_remove_bad_links { - if [ -f /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js ]; then - sed -i 's|maxcdn.bootstrapcdn.com|localhost|g' /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js + if [[ $ONION_ONLY == 'no' ]]; then + sed -i "s|link[href='https://maxcdn.bootstrapcdn.com.*|link[href='https://${FEDWIKI_DOMAIN_NAME}/fonts-font-awesome/css/font-awesome.min.css']\").length) {|g" /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js + + sed -i "s|\$('').appendTo(\"head\");|g" /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js + else + FEDWIKI_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_fedwiki/hostname) + sed -i "s|link[href='https://maxcdn.bootstrapcdn.com.*|link[href='http://${FEDWIKI_ONION_HOSTNAME}/fonts-font-awesome/css/font-awesome.min.css']\").length) {|g" /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js + + sed -i "s|\$('').appendTo(\"head\");|g" /usr/local/lib/node_modules/wiki/node_modules/wiki-security-friends/client/security.js fi if [ -f /usr/local/lib/node_modules/wiki/node_modules/localforage/docs/theme/style.css ]; then @@ -333,6 +340,10 @@ function fedwiki_setup_web { echo ' add_header X-Content-Type-Options nosniff;' >> $fedwiki_nginx_file echo ' add_header Strict-Transport-Security max-age=15768000;' >> $fedwiki_nginx_file echo '' >> $fedwiki_nginx_file + echo ' location /fonts-font-awesome/ {' >> $fedwiki_nginx_file + echo ' alias /usr/share/fonts-font-awesome/;' >> $fedwiki_nginx_file + echo ' }' >> $fedwiki_nginx_file + echo '' >> $fedwiki_nginx_file echo ' location / {' >> $fedwiki_nginx_file echo " proxy_pass http://localhost:${FEDWIKI_PORT};" >> $fedwiki_nginx_file echo ' proxy_set_header X-Real-IP $remote_addr;' >> $fedwiki_nginx_file @@ -354,6 +365,10 @@ function fedwiki_setup_web { echo ' add_header X-Frame-Options DENY;' >> $fedwiki_nginx_file echo ' add_header X-Content-Type-Options nosniff;' >> $fedwiki_nginx_file echo '' >> $fedwiki_nginx_file + echo ' location /fonts-font-awesome/ {' >> $fedwiki_nginx_file + echo ' alias /usr/share/fonts-font-awesome/;' >> $fedwiki_nginx_file + echo ' }' >> $fedwiki_nginx_file + echo '' >> $fedwiki_nginx_file echo ' location / {' >> $fedwiki_nginx_file echo " proxy_pass http://localhost:${FEDWIKI_PORT};" >> $fedwiki_nginx_file echo ' proxy_set_header X-Real-IP $remote_addr;' >> $fedwiki_nginx_file @@ -401,6 +416,8 @@ function install_fedwiki { function_check install_nodejs install_nodejs fedwiki + apt-get -yq install fonts-font-awesome + npm install -g wiki@$FEDWIKI_VERSION if [ ! "$?" = "0" ]; then echo $'Failed to install fedwiki'