Merge branch 'main' into ISD-1196/update-integration-test-workflow

canonical · Oct 24, 2023 · 0e1aaee · 0e1aaee
2 parents 533ffc1 + e504079
commit 0e1aaee
Show file tree

Hide file tree

Showing 9 changed files with 315 additions and 144 deletions.
diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml
@@ -14,7 +14,7 @@ jobs:
         --openstack-rc=${GITHUB_WORKSPACE}/openrc
         --kube-config=${GITHUB_WORKSPACE}/kube-config
         --screenshot-dir=/tmp
-      modules: '["test_addon", "test_core", "test_ingress", "test_cos_grafana", "test_cos_loki", "test_cos_prometheus"]'
+      modules: '["test_addon", "test_core", "test_external", "test_ingress", "test_cos_grafana", "test_cos_loki", "test_cos_prometheus"]'
       pre-run-script: |
         -c "sudo microk8s enable hostpath-storage
           sudo microk8s kubectl -n kube-system rollout status -w deployment/hostpath-provisioner

diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ build
 .tox
 .coverage
 __pycache__
+**/*.rock
diff --git a/src/charm.py b/src/charm.py
@@ -62,8 +62,8 @@ class _ReplicaRelationNotReady(Exception):
     _WP_CONFIG_PATH = "/var/www/html/wp-config.php"
     _CONTAINER_NAME = "wordpress"
     _SERVICE_NAME = "wordpress"
-    _WORDPRESS_USER = "www-data"
-    _WORDPRESS_GROUP = "www-data"
+    _WORDPRESS_USER = "_daemon_"
+    _WORDPRESS_GROUP = "_daemon_"
     _WORDPRESS_DB_CHARSET = "utf8mb4"
     _DATABASE_RELATION_NAME = "database"
 

diff --git a/wordpress.Dockerfile b/wordpress.Dockerfile
diff --git a/files/apache2.conf → ...press_rock/files/etc/apache2/apache2.conf b/files/apache2.conf → ...press_rock/files/etc/apache2/apache2.conf
diff --git a/files/docker-php-swift-proxy.conf → ...onf-available/docker-php-swift-proxy.conf b/files/docker-php-swift-proxy.conf → ...onf-available/docker-php-swift-proxy.conf
diff --git a/files/docker-php.conf → ...tc/apache2/conf-available/docker-php.conf b/files/docker-php.conf → ...tc/apache2/conf-available/docker-php.conf
diff --git a/files/000-default.conf → .../apache2/sites-available/000-default.conf b/files/000-default.conf → .../apache2/sites-available/000-default.conf