Skip to content

Commit 4652a5d

Browse files
authored
Merge pull request #69 from cryptomator/gh-playground
Move to GitHub Pages
2 parents aab6284 + 2cf2ccb commit 4652a5d

File tree

6 files changed

+35
-9
lines changed

6 files changed

+35
-9
lines changed

.github/workflows/deploy.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
uses: actions/configure-pages@v5
1818
- uses: actions/setup-python@v5
1919
with:
20-
python-version: '3.13'
21-
- run: pip install sphinx sphinx_rtd_theme
22-
- run: make gh-pages
20+
python-version: '3.12'
21+
- run: pip install sphinx sphinx_rtd_theme sphinx-reredirects
22+
- run: make dirhtml
2323
- name: Upload artifact
2424
uses: actions/upload-pages-artifact@v3
2525
with:
26-
path: 'build/html'
26+
path: 'build/dirhtml'
2727

2828
# DEPLOY
2929
deploy:

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM python:3.13-alpine
1+
FROM python:3.12-alpine
22

3-
RUN pip install --no-cache-dir sphinx sphinx_rtd_theme sphinx-autobuild
3+
RUN pip install --no-cache-dir sphinx sphinx_rtd_theme sphinx-autobuild sphinx-reredirects

Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ help:
1616
livehtml:
1717
sphinx-autobuild -b html $(ALLSPHINXOPTS) $(SOURCEDIR) $(BUILDDIR)/html
1818

19-
gh-pages:
20-
@$(SPHINXBUILD) -b html "$(SOURCEDIR)" $(BUILDDIR)/html/en/latest $(SPHINXOPTS)
2119
# Catch-all target: route all unknown targets to Sphinx using the new
2220
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
2321
%: Makefile

source/_templates/footer.html

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{# _templates/footer.html #}
2+
{% extends "!footer.html" %}
3+
4+
{% block extrafooter %}
5+
<a href="https://cryptomator.org/impressum/" target="_blank">Impressum</a><a href="https://cryptomator.org/privacy/" target="_blank">Privacy Policy</a>
6+
{% endblock %}
7+

source/_templates/layout.html

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{% extends "!layout.html" %}
2+
3+
{%- block extrahead %}
4+
<script defer data-domain="docs.cryptomator.org" src="https://plausible.skymatic.de/js/script.file-downloads.outbound-links.js" integrity="sha384-+tt0STxxWB96REUfXF1ykJzPEC5cT+TVotVR/JnYqAP04zxND4o8a0JcHg+aq46t" crossorigin="anonymous"></script>
5+
{% endblock %}
6+

source/conf.py

+16-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
# ones.
4343
#
4444
extensions = [
45-
'sphinx.ext.todo'
45+
'sphinx.ext.todo',
46+
'sphinx_reredirects'
4647
]
4748

4849
# Add any paths that contain templates here, relative to this directory.
@@ -121,6 +122,20 @@
121122

122123
html_favicon = 'img/favicon.ico'
123124

125+
html_show_sphinx = False
126+
127+
redirects = {
128+
"hub/setup/requirements": "/hub/deployment#hardware-requirements",
129+
"hub/setup/billing": "/hub/license",
130+
"hub/setup/keycloak-administration": "/hub/user-group-management",
131+
"hub/setup": "/hub/deployment",
132+
"hub/access-vault/unlocking-a-vault/4.-vault-unlocked": "/hub/access-vault/unlocking-a-vault/vault-unlocked",
133+
"hub/access-vault/unlocking-a-vault/3.-add-device": "/hub/access-vault/unlocking-a-vault/add-device",
134+
"hub/access-vault/unlocking-a-vault/2.-authenticate": "/hub/access-vault/unlocking-a-vault/authenticate",
135+
"hub/access-vault/unlocking-a-vault/1.-click-unlock": "/hub/access-vault/unlocking-a-vault/click-unlock",
136+
"desktop/vault-mounting": "/desktop/volume-type"
137+
}
138+
124139
# -- Options for HTMLHelp output ---------------------------------------------
125140

126141
# Output file base name for HTML help builder.

0 commit comments

Comments
 (0)