Skip to content

Commit cd6a258

Browse files
authored
Revert "[discourse-gatekeeper] Migrate charm docs (#267)" (#268)
This reverts commit 7d3d0c2.
1 parent 7d3d0c2 commit cd6a258

18 files changed

+113
-52
lines changed

docs/changelog.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Changelog
2+
3+
### 2025-03-10
4+
5+
- Add charm architecture diagram.
6+
- Add changelog for tracking user-relevant changes.

docs/explanation/architecture.md docs/explanation/charm-architecture.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,5 @@ CharmBase is the base class from which all Charms are formed, defined by [Ops](h
200200

201201
> See more in the Juju docs: [Charm](https://canonical-juju.readthedocs-hosted.com/en/3.6/user/reference/charm/).
202202
203-
The `__init__` method guarantees that the charm observes all events relevant to its operation and handles them.
203+
The `__init__` method guarantees that the charm observes all events relevant to its operation and handles them.
204+

docs/how-to/configure-hostname.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ Test the ingress by sending a GET request to the service with `Host` headers.
4242

4343
```
4444
curl -H "Host: <desired-hostname>" http://<nginx-ingress-integrator-service-ip>
45-
```
45+
```

docs/how-to/configure-initial-settings.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# How to configure initial settings
22

3-
[note]
4-
This only works when setting up WordPress initially, before database relation setup. Changing the value afterwards has no effect.
5-
[/note]
3+
> **NOTE** This only works when setting up WordPress initially, before database relation setup. Changing the
4+
value afterwards has no effect.
65

76
By providing configuration value for `initial_settings` at deployment, you can tweak a few
87
WordPress settings. For detailed information on configurable parameters, please refer to the
@@ -23,4 +22,4 @@ WordPress(`http://<wordpress-unit-ip>/wp-admin/options-general.php`).
2322

2423
You can also pass in the wordpress-k8s `configuration.yaml` file with the parameters above. See how
2524
to pass in a configuration file in the
26-
[juju documentation](https://juju.is/docs/olm/manage-applications#heading--configure-an-application-during-deployment).
25+
[juju documentation](https://juju.is/docs/olm/manage-applications#heading--configure-an-application-during-deployment).

docs/how-to/configure-object-storage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ You can then configure wordpress-k8s charm using the yaml contents above.
5959

6060
```
6161
juju config wordpress-k8s wp_plugin_openstack-objectstorage_config="$(cat <path-to-yaml>)"
62-
```
62+
```

docs/how-to/enable-waf.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ juju relate wordpress-k8s nginx-ingress-integrator
1414

1515
### Enable Modsecurity 3.0 WAF
1616

17-
[note]
18-
This feature is only available for
17+
> **NOTE** This feature is only available for
1918
[nginx-ingress-integrator](https://charmhub.io/nginx-ingress-integrator) charm.
20-
[/note]
2119

2220
The modsecurity WAF is enabled by default.
2321

@@ -49,4 +47,4 @@ Annotations: nginx.ingress.kubernetes.io/enable-modsecurity: true
4947
Events: <none>
5048
```
5149

52-
Note the `nginx.ingress.kubernetes.io/enable-modsecurity: true` annotation.
50+
Note the `nginx.ingress.kubernetes.io/enable-modsecurity: true` annotation.

docs/how-to/index.md

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# How-to guides
2+
3+
The following guides cover key processes and common tasks for managing
4+
and using the WordPress charm.
5+
6+
## Initial setup
7+
* [Retrieve initial credentials]
8+
* [Configure initial settings]
9+
10+
## Basic operations
11+
* [Configure hostname]
12+
* [Configure object storage]
13+
* [Install plugins]
14+
* [Install themes]
15+
* [Integrate with COS]
16+
17+
## Security
18+
* [Enable antispam]
19+
* [Enable WAF]
20+
* [Rotate secrets]
21+
22+
## Upgrade and redeployment
23+
* [Upgrade WordPress charm]
24+
* [Redeploy]
25+
26+
## Development
27+
* [Contribute]
28+
29+
<!--Links-->
30+
31+
[Retrieve initial credentials]: retrieve-initial-credentials.md
32+
[Configure initial settings]: configure-initial-settings.md
33+
[Integrate with COS]: integrate-with-cos.md
34+
[Configure hostname]: configure-hostname.md
35+
[Install plugins]: install-plugins.md
36+
[Install themes]: install-themes.md
37+
[Configure object storage]: configure-object-storage.md
38+
[Enable antispam]: enable-antispam.md
39+
[Enable WAF]: enable-waf.md
40+
[Rotate secrets]: rotate-secrets.md
41+
[Upgrade WordPress charm]: upgrade-wordpress-charm.md
42+
[Redeploy]: redeploy.md
43+
[Contribute]: contribute.md

docs/how-to/integrate-with-cos.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ juju run grafana-k8s/0 get-admin-password
5353

5454
You can now log into the Grafana dashboard by visiting `http://<grafana-unit-ip>:3000`. Navigate to
5555
`http://<grafana-unit-ip>:3000/dashboards` and access the WordPress dashboard named Wordpress Operator
56-
Overview.
56+
Overview.

docs/how-to/retrieve-initial-credentials.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Run the following command to get the initial admin password that can be used to
44
`http://<wordpress-unit-ip>/wp-login.php`.
55

66
```
7-
juju run wordpress-k8s/0 get-initial-password
7+
juju run wordpress-k8s/0 get-initial-password
88
```
99

1010
The output of the action should look something similar to the following:
@@ -20,7 +20,5 @@ unit-wordpress-k8s-0:
2020

2121
You can use the password to login to the admin account in `http://<wordpress-unit-ip>/wp-admin.php`.
2222

23-
[note]
24-
If the `admin_password` value was passed in the `initial_settings` configuration, the
23+
> **NOTE** If the `admin_password` value was passed in the `initial_settings` configuration, the
2524
password from the action is invalid.
26-
[/note]

docs/how-to/rotate-secrets.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ To securely update all the WordPress secrets, run the following action.
66
juju run wordpress-k8s/0 rotate-wordpress-secrets
77
```
88

9-
This action will force users to be logged out. All sessions and cookies will be invalidated.
9+
This action will force users to be logged out. All sessions and cookies will be invalidated.

docs/how-to/upgrade-wordpress-charm.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ After upgrading the WordPress Charm you need to update the database schema.
1717

1818
```
1919
juju run wordpress-k8s/0 update-database
20-
```
20+
```

docs/index.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
A [Juju](https://juju.is/) [charm](https://juju.is/docs/olm/charmed-operators) deploying and managing WordPress on Kubernetes. [WordPress](https://wordpress.com/) is the world's most popular website builder, and it's free and open-source.
1+
# Wordpress Operator
22

3-
This charm simplifies initial deployment and "day N" operations of WordPress on Kubernetes, including scaling the number of instances, integration with SSO, access to OpenStack Swift object storage for redundant file storage, and more. It allows for deployment on many different Kubernetes platforms, from [MicroK8s](https://microk8s.io/) to [Charmed Kubernetes](https://ubuntu.com/kubernetes) to public cloud Kubernetes offerings.
3+
A [Juju](https://juju.is/) [charm](https://juju.is/docs/olm/charmed-operators) deploying and managing WordPress on Kubernetes. [WordPress](https://wordpress.com/) is the world's most popular website builder, and it's free and open-source.
44

5-
As such, the charm makes it easy for those looking to take control of their own content management system whilst keeping operations simple and gives them the freedom to deploy on the Kubernetes platform of their choice.
5+
This charm simplifies initial deployment and operations of WordPress on Kubernetes, including scaling the number of instances, integration with SSO, access to OpenStack Swift object storage for redundant file storage, and more. It allows for deployment on many different Kubernetes platforms, from [MicroK8s](https://microk8s.io/) to [Charmed Kubernetes](https://ubuntu.com/kubernetes) to public cloud Kubernetes offerings.
66

77
This charm will make operating WordPress simple and straightforward for DevOps or SRE teams through Juju's clean interface. It will allow easy deployment into multiple environments to test changes and support scaling out for enterprise deployments.
88

99
## In this documentation
1010

1111
| | |
1212
|--|--|
13-
| [Tutorials](https://charmhub.io/wordpress-k8s/docs/tutorials-getting-started)</br> Get started - a hands-on introduction to using the Charmed WordPress operator for new users </br> | [How-to guides](https://charmhub.io/wordpress-k8s/docs/how-to) </br> Step-by-step guides covering key operations and common tasks |
13+
| [Tutorials](https://charmhub.io/wordpress-k8s/docs/tutorials-getting-started)</br> Get started - a hands-on introduction to using the Charmed WordPress operator for new users </br> | [How-to guides](https://charmhub.io/wordpress-k8s/docs/how-to-contribute) </br> Step-by-step guides covering key operations and common tasks |
1414
| [Reference](https://charmhub.io/wordpress-k8s/docs/reference-actions) </br> Technical information - specifications, APIs, architecture | [Explanation](https://charmhub.io/wordpress-k8s/docs/explanation-overview) </br> Concepts - discussion and clarification of key topics |
1515

1616
## Contributing to this documentation
@@ -25,10 +25,10 @@ The WordPress Operator is a member of the Ubuntu family. It's an open-source pro
2525

2626
- [Code of conduct](https://ubuntu.com/community/code-of-conduct)
2727
- [Get support](https://discourse.charmhub.io/)
28-
- [Join our online chat](https://chat.charmhub.io/charmhub/channels/charm-dev)
29-
- [Contribute](Contribute)
28+
- [Join our online chat](https://matrix.to/#/#charmhub-charmdev:ubuntu.com)
29+
- [Contribute](https://github.com/canonical/wordpress-k8s-operator/blob/main/CONTRIBUTING.md)
3030

31-
Thinking about using the WordPress Operator for your next project? [Get in touch](https://chat.charmhub.io/charmhub/channels/charm-dev)!
31+
Thinking about using the WordPress Operator for your next project? [Get in touch](https://matrix.to/#/#charmhub-charmdev:ubuntu.com)!
3232

3333
# Contents
3434

@@ -40,9 +40,9 @@ Thinking about using the WordPress Operator for your next project? [Get in touch
4040
1. [Configure object storage](how-to/configure-object-storage.md)
4141
1. [Install plugins](how-to/install-plugins.md)
4242
1. [Install themes](how-to/install-themes.md)
43-
1. [Integrate with COS](how-to/integrate-with-cos.md)
43+
1. [Integrate with COS](how-to/integrate-with-cos.md)
4444
1. [Enable antispam](how-to/enable-antispam.md)
45-
1. [Enable WAF](how-to/enable-waf.md)
45+
1. [Enable WAF](how-to/enable-waf.md)
4646
1. [Rotate secrets](how-to/rotate-secrets.md)
4747
1. [Upgrade WordPress charm](how-to/upgrade-wordpress-charm.md)
4848
1. [Redeploy](how-to/redeploy.md)
@@ -54,4 +54,4 @@ Thinking about using the WordPress Operator for your next project? [Get in touch
5454
1. [Plugins](reference/plugins.md)
5555
1. [Themes](reference/themes.md)
5656
1. [Explanation](explanation)
57-
1. [Charm architecture](explanation/architecture.md)
57+
1. [Charm architecture](explanation/charm-architecture.md)

docs/reference/actions.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22

33
See [Actions](https://charmhub.io/wordpress-k8s/actions).
44

5-
[note]
6-
Read more about actions in the Juju docs: [Action](https://juju.is/docs/juju/action)
7-
[/note]
5+
> Read more about actions in the Juju docs: [Action](https://juju.is/docs/juju/action)

docs/reference/configurations.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22

33
See [Configurations](https://charmhub.io/wordpress-k8s/configure).
44

5-
[note]
6-
Read more about configurations in the Juju docs: [Configuration](https://juju.is/docs/juju/configuration)
7-
[/note]
5+
> Read more about configurations in the Juju docs: [Configuration](https://juju.is/docs/juju/configuration)

docs/reference/external-access.md

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# External Access Requirements
2+
3+
The WordPress charm may need to connect to external services and resources for
4+
certain functionalities.
5+
6+
## OpenStack Object Storage
7+
8+
When activated, the WordPress instance will need to connect to configured
9+
OpenStack object storage for uploading and retrieval of media and assets.
10+
11+
## Akismet Spam Protection Plugin
12+
13+
The Akismet spam protection plugin, when enabled via the `wp_plugin_akismet_key`
14+
configuration, requires internet access to connect with
15+
the [Akismet API server](https://akismet.com/support/general/connection-issues/).
16+
This connection is essential for verifying and managing spam content.
17+
18+
## Installing Additional Plugins or Themes
19+
20+
For the installation of additional plugins or themes, the WordPress instance
21+
must access the main WordPress site to download installation files. Some plugins
22+
or themes might also need internet access to operate correctly after they are
23+
installed.

docs/reference/integrations.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ in the database side.
7878
Example database integrate command:
7979
```
8080
juju integrate wordpress-k8s:database mysql-k8s:database
81-
```
81+
```

docs/reference/plugins.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ _\*The descriptions of the following plugins are taken from the WordPress plugin
8080
- [wp-statistics](https://wordpress.org/plugins/wp-statistics/): GDPR compliant website statistics
8181
tool.
8282
- [xubuntu-team-members](https://git.launchpad.net/~canonical-sysadmins/wordpress/+git/wp-plugin-xubuntu-team-members):
83-
Adds the role "Xubuntu Team member"
83+
Adds the role "Xubuntu Team member"

docs/tutorial.md

+13-16
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ tutorial will walk you through each step of deployment to get a basic WordPress
1717
For more information about how to install Juju, see [Get started with Juju](https://juju.is/docs/olm/get-started-with-juju).
1818

1919
### Shell into the Multipass VM
20-
[note]
21-
If you're working locally, you don't need to do this step.
22-
[/note]
20+
> NOTE: If you're working locally, you don't need to do this step.
2321
2422
To be able to work inside the Multipass VM first you need to log in with the following command:
2523
```bash
@@ -99,19 +97,18 @@ password: <password> # should look something like: XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
9997
10098
```
10199

102-
[note]
103-
If you are using Multipass VM for this tutorial, you will need to route the IP from Multipass. To do this first get the IP of the Multipass VM.
104-
Outside the Multipass VM run:
105-
```
106-
multipass info my-juju-vm
107-
```
108-
The IP you see here will be called <VM_IP> in this example.
100+
> NOTE: If you are using Multipass VM for this tutorial, you will need to route the IP from Multipass. To do this first get the IP of the Multipass VM.
101+
> Outside the Multipass VM run:
102+
> ```
103+
> multipass info my-juju-vm
104+
> ```
105+
> The IP you see here will be called <VM_IP> in this example.
106+
>
107+
> Then route:
108+
> ```
109+
> sudo ip route add <UNIT_IP> via <VM_IP>
110+
> ```
109111
110-
Then route:
111-
```
112-
sudo ip route add <UNIT_IP> via <VM_IP>
113-
```
114-
[/note]
115112
116113
You can now access your WordPress application at `http://<UNIT_IP>/wp-login.php` and log in with the admin username and password from the previous action.
117114
@@ -129,4 +126,4 @@ If you used Multipass, to remove the Multipass instance you created for this tut
129126
130127
```
131128
multipass delete --purge my-juju-vm
132-
```
129+
```

0 commit comments

Comments
 (0)