Merge branch 'stretch' of https://github.com/bashrc/freedombone

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 <http://www.gnu.org/licenses/>.
 
-VARIANTS="full full-vim media"
+VARIANTS=""
 
 IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
@@ -262,6 +265,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 +403,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 +450,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
 

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=

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=""