wordpress-charmers team mailing list archive

[Thomas Cuthbert <thomas.cuthbert@xxxxxxxxxxxxx>]

Thomas Cuthbert has proposed merging ~tcuthbert/charm-k8s-wordpress:master into charm-k8s-wordpress:master.

Requested reviews:
  Wordpress Charmers (wordpress-charmers)

For more details, see:
https://code.launchpad.net/~tcuthbert/charm-k8s-wordpress/+git/charm-k8s-wordpress-1/+merge/394731
-- 
Your team Wordpress Charmers is requested to review the proposed merge of ~tcuthbert/charm-k8s-wordpress:master into charm-k8s-wordpress:master.

diff --git a/README.md b/README.md
index 65c19a5..c71bcd0 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,14 @@ Notes for deploying a test setup locally using microk8s:
     juju add-model wordpress-test
     juju create-storage-pool operator-storage kubernetes storage-class=microk8s-hostpath
     juju deploy cs:~wordpress-charmers/wordpress-k8s --channel=edge wordpress
-    juju config wordpress db_host=10.1.1.1 db_user=wp db_password=secret
+    # TLS certificates are required for the ingress to function properly, self-signed is okay
+    # for testing but make sure you use valid ones in production.
+    openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout server.key -out server.crt
+    kubectl create secret tls tls-wordpress --cert=server.crt --key=server.key
+    juju config wordpress db_host=10.1.1.1 db_user=wp db_password=secret tls_secret_name=tls-wordpress \
+        initial_settings="user_name: admin
+        admin_email: devnull@xxxxxxxxxxxxx
+        weblog_title: Test Blog
+        blog_public: False"
     juju wait
     juju status # Shows IP address, and port is 80
diff --git a/config.yaml b/config.yaml
index b426487..2f829ef 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,8 +1,8 @@
 options:
   image:
     type: string
-    description: "The docker image to install. Required. Defaults to Dockerhub wordpress:php7.3"
-    default: "wordpress:php7.3"
+    description: "The docker image to install. Required. Defaults to Dockerhub wordpress-charmers/wordpress:bionic-stable"
+    default: "wordpresscharmers/wordpress:bionic-stable"
   image_user:
     type: string
     description: "Username to use for the configured image registry, if required"