Compare commits
No commits in common. "1f1181a8ff5ebf662e280ea594ad71d758cf0ceb" and "89cd7caf248fffe053bd4b8a5bbc4949c6a48825" have entirely different histories.
1f1181a8ff
...
89cd7caf24
3 changed files with 6 additions and 27 deletions
16
Makefile
16
Makefile
|
@ -76,24 +76,14 @@ devserver-global:
|
||||||
publish:
|
publish:
|
||||||
"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)
|
"$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)
|
||||||
|
|
||||||
ssh_upload: ssh_copy fix_remote_permissions
|
ssh_upload: publish
|
||||||
|
|
||||||
ssh_copy: publish
|
|
||||||
scp -P $(SSH_PORT) -r "$(OUTPUTDIR)"/* "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)"
|
scp -P $(SSH_PORT) -r "$(OUTPUTDIR)"/* "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)"
|
||||||
|
|
||||||
sftp_upload: sftp_copy fix_remote_permissions
|
sftp_upload: publish
|
||||||
|
|
||||||
sftp_copy: publish
|
|
||||||
printf 'put -r $(OUTPUTDIR)/*' | sftp $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
|
printf 'put -r $(OUTPUTDIR)/*' | sftp $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
|
||||||
|
|
||||||
rsync_upload: rsync_copy fix_remote_permissions
|
rsync_upload: publish
|
||||||
|
|
||||||
rsync_copy: publish
|
|
||||||
rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --include tags --cvs-exclude --delete "$(OUTPUTDIR)"/ "$(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)"
|
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
|
.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload
|
||||||
|
|
|
@ -47,12 +47,6 @@ You can submit issues at
|
||||||
<https://git.copyleft.org/copyleft-next/copyleft-next/issues> or on the
|
<https://git.copyleft.org/copyleft-next/copyleft-next/issues> or on the
|
||||||
mailing list.
|
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
|
## Real-Time Chat
|
||||||
|
|
||||||
We previously had real-time chat locations, but the archives were not well
|
We previously had real-time chat locations, but the archives were not well
|
||||||
|
|
|
@ -127,19 +127,14 @@
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<footer id="contentinfo" class="f6 f6-ns ph3 ph4-ns pv3 pv4-ns mt5">
|
<footer id="contentinfo" class="f6 f6-ns ph3 ph4-ns pv3 pv4-ns mt5">
|
||||||
<hr/>
|
We thank Software Freedom Conservancy (SFC) for donating
|
||||||
<p align="right"><a href="https://fedi.copyleft.org/@next"><img src="/theme/images/fediverse-logo.svg" class="mt3" style="width: 100px; filter: saturate(0)" alt="Follow @next@copyleft.org on the Fediverse"></a></p>
|
infrastructure to copyleft-next<br/>
|
||||||
<p align="left">
|
<img src="/theme/images/conservancy-header.svg" class="mt3" style="width: 150px; filter: saturate(0)" alt="Software Freedom Conservancy logo"/>
|
||||||
<p><img src="/theme/images/conservancy-header.svg" class="mt3" style="width: 100px; filter: saturate(0)" alt="Software Freedom Conservancy logo"/>
|
|
||||||
We thank Software Freedom Conservancy (SFC) for donating infrastructure to copyleft-next
|
|
||||||
</p>
|
|
||||||
<p>Website License details:</p>
|
|
||||||
<p class="f7 mt4">No Rights Reserved — CC0 1.0 Universal</p>
|
<p class="f7 mt4">No Rights Reserved — CC0 1.0 Universal</p>
|
||||||
<p class="f7 mt2 black-60">Jost font is copyright 2020 The Jost Project Authors, SIL Open Font License v1.1<br>
|
<p class="f7 mt2 black-60">Jost font is copyright 2020 The Jost Project Authors, SIL Open Font License v1.1<br>
|
||||||
Tachyons CSS is copyright 2020 Adam Morse & John Otander, MIT License<br>
|
Tachyons CSS is copyright 2020 Adam Morse & John Otander, MIT License<br>
|
||||||
Velocity JS is copyright 2014 Julian Shapiro, MIT License<br>
|
Velocity JS is copyright 2014 Julian Shapiro, MIT License<br>
|
||||||
Pelican is copyright 2007 Free Software Foundation, Inc, GNU AGPL v3.0</p>
|
Pelican is copyright 2007 Free Software Foundation, Inc, GNU AGPL v3.0</p>
|
||||||
<p><a href="https://git.copyleft.org/copyleft-next/website">Website Sources</p>
|
|
||||||
</footer>
|
</footer>
|
||||||
<script src="{{ SITE_URL }}/{{ THEME_STATIC_DIR }}/js/velocity.min.js"></script>
|
<script src="{{ SITE_URL }}/{{ THEME_STATIC_DIR }}/js/velocity.min.js"></script>
|
||||||
{% if output_file == 'index.html' %}
|
{% if output_file == 'index.html' %}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue