From 63d0a32e7dd453be0137bbb74ce0aa96f691e9ed Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 2 Jan 2018 15:42:57 +0000 Subject: [PATCH 1/4] Bump gnusocial commit --- src/freedombone-app-gnusocial | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index 78717c23..5a6ddc77 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -37,7 +37,7 @@ GNUSOCIAL_DOMAIN_NAME= GNUSOCIAL_CODE= GNUSOCIAL_ONION_PORT=8087 GNUSOCIAL_REPO="https://git.gnu.io/gnu/gnu-social.git" -GNUSOCIAL_COMMIT='d9fbc17f7745edb3e3eeddf6485f70b187df762f' +GNUSOCIAL_COMMIT='ffe14fe5f326f013a34fdd303c0e5e8aae772559' GNUSOCIAL_ADMIN_PASSWORD= GNUSOCIAL_BACKGROUND_IMAGE_URL= From 9cd6d3413dd3076c9c07669801f1f1eea83690fb Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 2 Jan 2018 15:52:46 +0000 Subject: [PATCH 2/4] Bump pleroma commit --- src/freedombone-app-pleroma | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/freedombone-app-pleroma b/src/freedombone-app-pleroma index 03bdfe52..a1a45046 100755 --- a/src/freedombone-app-pleroma +++ b/src/freedombone-app-pleroma @@ -39,7 +39,7 @@ PLEROMA_CODE= PLEROMA_PORT=4000 PLEROMA_ONION_PORT=8011 PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git" -PLEROMA_COMMIT='5fc6e9d467f69af155627cccaa27616fe7ffc61f' +PLEROMA_COMMIT='5c09d8d3f199a3f323471f9ba4578371226cd726' PLEROMA_ADMIN_PASSWORD= PLEROMA_DIR=/etc/pleroma PLEROMA_SECRET_KEY="" From e98a2fc7c01be50c1dc65c07e3eb948921bf31a0 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 4 Jan 2018 13:16:49 +0000 Subject: [PATCH 3/4] Add fedwiki friends module --- src/freedombone-app-fedwiki | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/freedombone-app-fedwiki b/src/freedombone-app-fedwiki index fdcdb730..349dd456 100755 --- a/src/freedombone-app-fedwiki +++ b/src/freedombone-app-fedwiki @@ -262,6 +262,7 @@ function remove_fedwiki { rm /etc/systemd/system/fedwiki.service systemctl daemon-reload + npm uninstall -g wiki-security-friends npm uninstall -g wiki function_check remove_nodejs @@ -399,6 +400,12 @@ function install_fedwiki { exit 6293523 fi + npm install -g wiki-security-friends@0.1.0 + if [ ! "$?" = "0" ]; then + echo $'Failed to install wiki-security-friends' + exit 783533 + fi + if [ ! -f /usr/local/bin/wiki ]; then echo $'wiki was not installed' exit 5293524 @@ -440,6 +447,8 @@ function install_fedwiki { ${PROJECT_NAME}-pass -u $MY_USERNAME -a fedwiki -p "$FEDWIKI_ADMIN_PASSWORD" + fedwiki_auth_file=/var/lib/fedwiki/status/owner.json + function_check add_ddns_domain add_ddns_domain $FEDWIKI_DOMAIN_NAME From 6d5a449a1aee479a3e0dc91eb8b4f724f5738c95 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 4 Jan 2018 13:19:49 +0000 Subject: [PATCH 4/4] Deprecate fedwiki --- src/freedombone-app-fedwiki | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/freedombone-app-fedwiki b/src/freedombone-app-fedwiki index 349dd456..8be46f34 100755 --- a/src/freedombone-app-fedwiki +++ b/src/freedombone-app-fedwiki @@ -10,6 +10,9 @@ # # Federated wiki # +# The wiki itself looks ok, but there is no straightforward way for a +# user to authenticate which isn't proprietary +# # License # ======= # @@ -28,7 +31,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