Merge ~przemeklal/charm-juju-ro:add-apache2 into charm-juju-ro:main

[Przemyslaw Lal]

[Paul Goins (vultaire)]

LGTM.

review: Approve

[Jose Guedez (jfguedez)]

Overall looks good. Just a couple comments inline that might help maintainability going forward.

review: Needs Fixing

[Eric Chen (eric-chen)]

Mark it as WIP until Przemeklal has time to fix it.

Unmerged commits

aa64d7d... by Przemyslaw Lal on 2022-05-27

Publish juju-ro output using apache2

Signed-off-by: Przemyslaw Lal <email address hidden>

diff --git a/config.yaml b/config.yaml
index ff36f8c..a49bec0 100644
--- a/config.yaml
+++ b/config.yaml
@@ -11,7 +11,7 @@ options:
   dumpdirectory:
       type: string
       description: "location to store the juju status output and dump the bundles."
-      default: "/var/lib/jujureadonly"
+      default: "/var/www/html"
   interval:
       type: int
       default: 30
diff --git a/src/charm.py b/src/charm.py
index eb213f6..ca8742f 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -13,6 +13,7 @@ outputs and bundle exports.
 import pathlib
 import os
 import logging
+import subprocess
 
 from ops.charm import CharmBase
 from ops.framework import StoredState
@@ -29,6 +30,8 @@ from charms.juju_ro.v0.lib_juju_addons import (
 
 logger = logging.getLogger(__name__)
 
+APACHE2_DEFAULT_HTML_DIR = "/var/www/html/"
+APACHE2_DEFAULT_HTML_FILE = APACHE2_DEFAULT_HTML_DIR + "index.html"
 
 class JujuROHelper:
     """Juju Sanitizer helper object."""
@@ -109,10 +112,18 @@ class JujuRoCharm(CharmBase):
         }
         self.logger = logging.getLogger(__name__)
 
-    def on_install(self, event):
-        """Install juju snap and cron scripts."""
+    def install_services(self):
+        subprocess.check_call(["apt-get", "install", "-y", "apache2"])
+        # remove the default Apache2 HTML file as we don't need it
+        if os.path.exists(APACHE2_DEFAULT_HTML_FILE):
+            os.unlink(APACHE2_DEFAULT_HTML_FILE)
+
         self.jujuro_helper.install_snap()
         self.jujuro_helper.install_scripts()
+
+    def on_install(self, event):
+        """Install juju snap, cron scripts and apache server."""
+        self.install_services()
         self.state.installed = True
         self.update_status(event)
 
@@ -120,8 +131,7 @@ class JujuRoCharm(CharmBase):
         """Handle upgrade and resource updates."""
         # Reinstall snaps and scripts
         logging.info("upgrade-charm: reinstall")
-        self.jujuro_helper.install_snap()
-        self.jujuro_helper.install_scripts()
+        self.install_services()
         self.update_status(event)
 
     def config_juju_readonly_user(self):
@@ -139,7 +149,7 @@ class JujuRoCharm(CharmBase):
             self.ctxt["dumpdir"],
             owner=self.ctxt["user"],
             group=self.ctxt["group"],
-            perms=0o700,
+            perms=0o755,
             force=True,
         )