diff --git a/Makefile b/Makefile index 121b71f..5a30f19 100644 --- a/Makefile +++ b/Makefile @@ -76,24 +76,14 @@ devserver-global: publish: "$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS) -ssh_upload: ssh_copy fix_remote_permissions - -ssh_copy: publish +ssh_upload: publish scp -P $(SSH_PORT) -r "$(OUTPUTDIR)"/* "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)" -sftp_upload: sftp_copy fix_remote_permissions - -sftp_copy: publish +sftp_upload: publish printf 'put -r $(OUTPUTDIR)/*' | sftp $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) -rsync_upload: rsync_copy fix_remote_permissions - -rsync_copy: publish +rsync_upload: publish rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --include tags --cvs-exclude --delete "$(OUTPUTDIR)"/ "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)" -fix_remote_permissions: - ssh -p $(SSH_PORT) $(SSH_USER)@$(SSH_HOST) "find ${SSH_TARGET_DIR} -exec chmod gou+r {} \;" - ssh -p $(SSH_PORT) $(SSH_USER)@$(SSH_HOST) "find ${SSH_TARGET_DIR} -type d -exec chmod gou+rx {} \;" - .PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload diff --git a/content/pages/02_contribute.md b/content/pages/02_contribute.md index 4648211..805abf6 100644 --- a/content/pages/02_contribute.md +++ b/content/pages/02_contribute.md @@ -47,12 +47,6 @@ You can submit issues at or on the mailing list. -## Fediverse / Mastodon - -We encourage you to -[follow @next@copyleft.org](https://fedi.copyleft.org/@next) the Fediverse -via our Mastodon server. - ## Real-Time Chat We previously had real-time chat locations, but the archives were not well diff --git a/themes/next.copyleft.org/templates/base.html b/themes/next.copyleft.org/templates/base.html index a0c8cbe..78717ab 100644 --- a/themes/next.copyleft.org/templates/base.html +++ b/themes/next.copyleft.org/templates/base.html @@ -127,19 +127,14 @@ {% if output_file == 'index.html' %}