fix(apache): fix root permission issue

apache/Cargo.toml

@@ -6,7 +6,7 @@ description = "Apache HTTPD server plugin for FluentCI"
 edition = "2021"
 license = "MIT"
 name = "apache"
-version = "0.1.2"
+version = "0.1.3"
 
 [lib]
 crate-type = [

apache/fluentci.toml

@@ -8,4 +8,4 @@ keywords = [
 ]
 license = "MIT"
 name = "apache"
-version = "0.1.2"
+version = "0.1.3"

apache/httpd.conf

@@ -27,8 +27,8 @@ LoadModule log_config_module modules/mod_log_config.so
     Require all denied
 </Directory>
 
-DocumentRoot  "${HTTPD_CONFDIR}/../"
-<Directory "${HTTPD_CONFDIR}/../">
+DocumentRoot  "${HTTPD_CONFDIR}/../../"
+<Directory "${HTTPD_CONFDIR}/../../">
     Options Indexes FollowSymLinks
     AllowOverride None
     Require all granted
@@ -49,9 +49,9 @@ CustomLog "${HTTPD_ACCESS_LOG_FILE}" access
     ServerName  php_localhost
 
     UseCanonicalName    Off
-    DocumentRoot "${HTTPD_CONFDIR}/../"
+    DocumentRoot "${HTTPD_CONFDIR}/../../"
 
-    <Directory "${HTTPD_CONFDIR}/../">
+    <Directory "${HTTPD_CONFDIR}/../../">
         Options All
         AllowOverride All
         <IfModule mod_authz_host.c>

apache/src/helpers.rs

@@ -25,6 +25,11 @@ pub fn setup() -> Result<String, Error> {
     let httpd_confdir = dag().get_env("HTTPD_CONFDIR")?;
     let httpd_error_log_file = dag().get_env("HTTPD_ERROR_LOG_FILE")?;
     let httpd_access_log_file = dag().get_env("HTTPD_ACCESS_LOG_FILE")?;
+    let is_root = dag()
+        .pkgx()?
+        .with_exec(vec!["whoami"])?
+        .stdout()?
+        .contains("root");
 
     if httpd_port.is_empty() {
         dag().set_envs(vec![("HTTPD_PORT".into(), "8080".into())])?;
@@ -60,7 +65,17 @@ pub fn setup() -> Result<String, Error> {
         .with_exec(vec!["[ -f httpd.conf ] || flox activate -- wget https://raw.githubusercontent.com/fluentci-io/services/main/apache/httpd.conf"])?
         .with_exec(vec!["[ -f ../../index.html ] || flox activate -- wget https://raw.githubusercontent.com/fluentci-io/services/main/apache/web/index.html -O ../../index.html"])?
         .with_exec(vec![
-            "grep -q web Procfile || echo -e 'web: apachectl start -f $PWD/httpd.conf -D FOREGROUND\\n' >> Procfile",
+            match is_root {
+                true => "chown -R fluentci /root /nix && chown -R root /root/.cache",
+                false => "true"
+            }
+        ])?
+        .with_exec(vec![
+            match is_root {
+                true => "grep -q web Procfile || echo -e 'web: sudo -H -E -u fluentci PATH=$PATH bash -c \"flox activate -- apachectl start -f $PWD/httpd.conf -D FOREGROUND \" \\n' >> Procfile",
+                false => "grep -q web Procfile || echo -e 'web: apachectl start -f $PWD/httpd.conf -D FOREGROUND\\n' >> Procfile"
+            }
+            ,
         ])?
         .stdout()?;
 

apache/src/lib.rs

@@ -6,6 +6,8 @@ pub mod helpers;
 #[plugin_fn]
 pub fn start(_args: String) -> FnResult<String> {
     helpers::setup()?;
+
+    let port = dag().get_env("HTTPD_PORT")?;
     let stdout = dag()
         .flox()?
         .with_workdir(".fluentci/apache")?
@@ -19,7 +21,7 @@ pub fn start(_args: String) -> FnResult<String> {
         .with_exec(vec![
             "overmind start -f Procfile --daemonize || flox activate -- overmind restart web",
         ])?
-        .with_exec(vec!["sleep", "3"])?
+        .wait_on(port.parse()?, timeout)
         .with_exec(vec!["overmind", "status"])?
         .with_exec(vec!["curl", "-s", "http://localhost:$HTTPD_PORT"])?
         .stdout()?;

postgres/src/helpers.rs

@@ -65,7 +65,7 @@ pub fn setup() -> Result<String, Error> {
         ])?
         .with_exec(vec![
             match is_root {
-                true => "chown -R fluentci /root /nix",
+                true => "chown -R fluentci /root /nix && chown -R root /root/.cache",
                 false => "true"
             }
         ])?