wordpress-charmers team mailing list archive

[Tom Haddon <tom.haddon@xxxxxxxxxxxxx>]

Tom Haddon has proposed merging ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:rename-charm into charm-k8s-wordpress:master.

Commit message:
Rename the charm to wordpress-k8s to avoid collision with machine charm

Requested reviews:
  Canonical IS Reviewers (canonical-is-reviewers)
  Wordpress Charmers (wordpress-charmers)

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

diff --git a/Makefile b/Makefile
index c46ed23..666606c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-wordpress.charm: src/*.py requirements.txt
+wordpress-k8s.charm: src/*.py requirements.txt
 	@echo "Building Kubernetes WordPress Charm."
 	@charmcraft build
 
diff --git a/README.md b/README.md
index 4634a3e..d6e4fa4 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,9 @@ details on using Juju with MicroK8s for easy local testing [see here](https://ju
 To deploy the charm and relate it to the [MariaDB K8s charm](https://charmhub.io/mariadb) within a Juju
 Kubernetes model:
 
-    juju deploy cs:~charmed-osm/mariadb-k8s
-    juju deploy cs:~wordpress-charmers/wordpress
-    juju add-relation wordpress mariadb-k8s:mysql
+    juju deploy charmed-osm-mariadb-k8s mariadb
+    juju deploy wordpress-k8s
+    juju relate wordpress-k8s mariadb:mysql
 
 It will take about 5 to 10 minutes for Juju hooks to discover the site is live
 and perform the initial setup for you. Once the "Workload" status is "active",
@@ -29,18 +29,18 @@ your WordPress site is configured.
 
 To retrieve the auto-generated admin password, run the following:
 
-    juju run-action --wait wordpress/0 get-initial-password
+    juju run-action --wait wordpress-k8s/0 get-initial-password
 
 You should now be able to browse to the IP address of the unit. Here's some
 sample output from `juju status`:
 
-    Unit            Workload     Agent  Address      Ports     Message
-    mariadb-k8s/0*  active       idle   10.1.234.43  3306/TCP  ready
-    wordpress/0*    active       idle   10.1.234.13  80/TCP    Pod configured
+    Unit                Workload     Agent  Address      Ports     Message
+    mariadb/0*          active       idle   10.1.234.43  3306/TCP  ready
+    wordpress-k8s/0*    active       idle   10.1.234.13  80/TCP    Pod configured
 
 In this case our `UNIT_IP` is 10.1.234.13. If we visit `http://${UNIT_IP}/`
 you'll see the WordPress site itself, or you can log in to the admin site
 at `http://{$UNIT_IP}/wp-admin` using a username of `admin` and the password
 from the `get-initial-password` action above.
 
-For further details, [see here](https://charmhub.io/wordpress/docs).
+For further details, [see here](https://charmhub.io/wordpress-k8s/docs).
diff --git a/metadata.yaml b/metadata.yaml
index e97fe57..4259f46 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,4 +1,5 @@
-name: "wordpress"
+name: wordpress-k8s
+display-name: WordPress
 summary: "WordPress is open source software you can use to create a beautiful website, blog, or app."
 description: "WordPress is open source software you can use to create a beautiful website, blog, or app. https://wordpress.org/";
 docs: https://discourse.charmhub.io/t/wordpress-documentation-overview/4052