Skip to content

Commit 1a243ee

Browse files
authored
Add redirects for all charmhub pages (14) (#961)
* feat: add rediraffe sphinx extension and discourse redirects for each page * convert tabs to single space * fix: minor style issues in README.md and CONTRIBUTING.md * comment out old redirect extension to avoid confusion
1 parent cee4c6c commit 1a243ee

File tree

5 files changed

+114
-1
lines changed

5 files changed

+114
-1
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ tox # runs 'lint' and 'unit' environments
4040
## Build charm
4141

4242
The build environment assumes that there are preinstalled on the system:
43+
4344
* [tox](https://tox.wiki/) (version 4+ !!!)
4445
* [poetry](https://python-poetry.org/)
4546
* [charmcraft](https://snapcraft.io/charmcraft)
@@ -69,6 +70,7 @@ pipx install charmcraftcache
6970
```
7071

7172
Ensure local pip binaries are in your $PATH (otherwise re-login to your shell):
73+
7274
```shell
7375
charmcraftcache --help
7476
```

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Charmed PostgreSQL VM Operator
2+
23
[![CharmHub Badge](https://charmhub.io/postgresql/badge.svg)](https://charmhub.io/postgresql)
34
[![Release](https://github.com/canonical/postgresql-operator/actions/workflows/release.yaml/badge.svg)](https://github.com/canonical/postgresql-operator/actions/workflows/release.yaml)
45
[![Tests](https://github.com/canonical/postgresql-operator/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/canonical/postgresql-operator/actions/workflows/ci.yaml?query=branch%3Amain)
@@ -126,13 +127,15 @@ juju integrate postgresql <application_name>
126127
```
127128

128129
To remove a relation:
130+
129131
```shell
130132
juju remove-relation postgresql <application_name>
131133
```
132134

133135
#### Legacy `pgsql` interface
134136

135137
We have also added support for the two database legacy relations from the [original version](https://launchpad.net/postgresql-charm) of the charm via the `pgsql` interface. Please note that these relations will be deprecated.
138+
136139
```shell
137140
juju relate postgresql:db mailman3-core
138141
juju relate postgresql:db-admin landscape-server

docs/conf.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,9 @@
193193
# NOTE: If undefined, set to None, or empty,
194194
# the sphinx_reredirects extension will be disabled.
195195

196-
redirects = {}
196+
# redirects = {}
197197

198+
rediraffe_redirects = "redirects.txt"
198199

199200
###########################
200201
# Link checker exceptions #
@@ -258,6 +259,7 @@
258259
"sphinxcontrib.cairosvgconverter",
259260
"sphinx_last_updated_by_git",
260261
"sphinx.ext.intersphinx",
262+
"sphinxext.rediraffe"
261263
]
262264

263265
# Excludes files or directories from processing

docs/redirects.txt

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# The redirects.txt file stores all the redirects for the published docs
2+
# If you change a filename, move or delete a file, you need a redirect here.
3+
# - Comment lines start with a hash (#) and are ignored
4+
# - Each redirect should appear on its own line
5+
6+
# We are using the dirhtml builder, so files are treated as directories:
7+
# - A file is built like `filename/index.html`, not `filename.html`
8+
# - *Do* include a trailing slash at the end of the path
9+
# - *Do not* include a file extension or you'll get errors
10+
# - Paths don't need a slash in front of them
11+
12+
# Example:
13+
# redirect/from/file/ redirect/to/file/
14+
15+
# Tutorials
16+
t-set-up tutorial/
17+
t-deploy tutorial/
18+
t-access tutorial/
19+
t-scale tutorial/
20+
t-manage-passwords tutorial/
21+
t-integrate tutorial/
22+
t-enable-tls tutorial/
23+
t-clean-up tutorial/
24+
25+
# How-to guides
26+
h-deploy how-to/deploy
27+
h-deploy-sunbeam how-to/deploy/sunbeam
28+
h-deploy-maas how-to/deploy/maas
29+
h-deploy-ec2 how-to/deploy/aws-ec2
30+
h-deploy-gce how-to/deploy/gce
31+
h-deploy-azure how-to/deploy/azure
32+
h-deploy-multi-az how-to/deploy/multi-az
33+
h-deploy-tls-vip-access how-to/deploy/tls-vip-access
34+
h-deploy-terraform how-to/deploy/terraform
35+
h-deploy-airgapped how-to/deploy/air-gapped
36+
h-deploy-juju-storage how-to/deploy/juju-storage
37+
38+
h-integrate how-to/integrate-with-another-application
39+
h-manage-passwords how-to/manage-passwords
40+
h-external-access how-to/external-network-access
41+
h-scale how-to/scale-replicas
42+
h-switchover-failover how-to/switchover-failover
43+
h-enable-tls how-to/enable-tls
44+
h-enable-ldap how-to/enable-ldap
45+
46+
h-enable-plugins-extensions how-to/enable-plugins-extensions
47+
h-plugins-timescaledb how-to/enable-plugins-extensions/enable-timescaledb
48+
49+
h-backup how-to/back-up-and-restore/
50+
h-configure-s3-aws how-to/back-up-and-restore/configure-s3-aws
51+
h-configure-s3-radosgw how-to/back-up-and-restore/configure-s3-radosgw
52+
h-create-backup how-to/back-up-and-restore/create-a-backup
53+
h-restore-backup how-to/back-up-and-restore/restore-a-backup
54+
h-manage-backup-retention how-to/back-up-and-restore/manage-backup-retention
55+
h-migrate-cluster how-to/back-up-and-restore/migrate-a-cluster
56+
57+
h-monitor how-to/monitoring-cos/
58+
h-enable-monitoring how-to/monitoring-cos/enable-monitoring
59+
h-enable-alert-rules how-to/monitoring-cos/enable-alert-rules
60+
h-enable-tracing how-to/monitoring-cos/enable-tracing
61+
h-enable-profiling how-to/monitoring-cos/enable-profiling
62+
63+
h-upgrade how-to/upgrade/
64+
h-upgrade-minor how-to/upgrade/perform-a-minor-upgrade
65+
h-rollback-minor how-to/upgrade/perform-a-minor-rollback
66+
67+
h-async how-to/cross-regional-async-replication/
68+
h-async-set-up how-to/cross-regional-async-replication/set-up-clusters
69+
h-async-integrate how-to/cross-regional-async-replication/integrate-with-a-client-app
70+
h-async-remove-recover how-to/cross-regional-async-replication/remove-or-recover-a-cluster
71+
72+
h-development how-to/development/
73+
h-development-integrate how-to/development/integrate-with-your-charm
74+
h-migrate-pgdump how-to/development/migrate-data-via-pg-dump
75+
h-migrate-backup-restore how-to/development/migrate-data-via-backup-restore
76+
77+
# Reference
78+
r-releases reference/releases
79+
r-versions reference/versions
80+
r-system-requirements reference/system-requirements
81+
r-software-testing reference/software-testing
82+
r-performance reference/performance-and-resources
83+
84+
r-troubleshooting reference/troubleshooting/
85+
r-sos-report reference/troubleshooting/sos-report
86+
r-cli-helpers reference/troubleshooting/cli-helpers
87+
88+
r-plugins-extensions reference/plugins-extensions
89+
r-alert-rules reference/alert-rules
90+
r-statuses reference/statuses
91+
r-contacts reference/contacts
92+
93+
# Explanation
94+
e-architecture explanation/architecture
95+
e-interfaces-endpoints explanation/interfaces-and-endpoints
96+
e-juju-details explanation/juju
97+
e-legacy-charm explanation/legacy-charm
98+
e-units explanation/units
99+
e-users explanation/users
100+
e-roles explanation/roles
101+
e-logs explanation/logs
102+
e-connection-pooling explanation/connection-pooling
103+
104+
e-security explanation/security/
105+
e-cryptography explanation/security/cryptography

docs/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
canonical-sphinx[full]
22
sphinxcontrib-svg2pdfconverter[CairoSVG]
33
sphinx-last-updated-by-git
4+
sphinxext-rediraffe

0 commit comments

Comments
 (0)