daemon: fixed template issues with http service

coreemu · Jun 26, 2024 · 27d3fb5 · 27d3fb5
1 parent 4340c4c
commit 27d3fb5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/daemon/core/services/defaults/utilservices/templates/etc/apache2/apache2.conf b/daemon/core/services/defaults/utilservices/templates/etc/apache2/apache2.conf
@@ -1,7 +1,7 @@
 # apache2.conf generated by utility.py:HttpService
-Mutex file:$APACHE_LOCK_DIR default
+Mutex file:${"${APACHE_LOCK_DIR}"} default
 
-PidFile $APACHE_PID_FILE
+PidFile ${"${APACHE_PID_FILE}"}
 Timeout 300
 KeepAlive On
 MaxKeepAliveRequests 100
@@ -37,8 +37,8 @@ LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
     MaxRequestsPerChild   0
 </IfModule>
 
-User $APACHE_RUN_USER
-Group $APACHE_RUN_GROUP
+User ${"${APACHE_RUN_USER}"}
+Group ${"${APACHE_RUN_GROUP}"}
 
 AccessFileName .htaccess
 
@@ -50,7 +50,7 @@ DefaultType None
 
 HostnameLookups Off
 
-ErrorLog $APACHE_LOG_DIR/error.log
+ErrorLog ${"${APACHE_LOG_DIR}"}/error.log
 LogLevel warn
 
 #Include mods-enabled/*.load
@@ -74,9 +74,9 @@ Listen 80
     Listen 443
 </IfModule>
 
-LogFormat "%v:%p %h %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\"" vhost_combined
-LogFormat "%h %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\"" combined
-LogFormat "%h %l %u %t \\"%r\\" %>s %O" common
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 
@@ -96,7 +96,7 @@ TraceEnable Off
         AllowOverride None
         Require all granted
     </Directory>
-    ErrorLog $APACHE_LOG_DIR/error.log
+    ErrorLog ${"${APACHE_LOG_DIR}"}/error.log
     LogLevel warn
-    CustomLog $APACHE_LOG_DIR/access.log combined
+    CustomLog ${"${APACHE_LOG_DIR}"}/access.log combined
 </VirtualHost>
diff --git a/daemon/core/services/defaults/utilservices/templates/var/www/index.html b/daemon/core/services/defaults/utilservices/templates/var/www/index.html
@@ -6,7 +6,7 @@ <h1>${node.name} web server</h1>
 <p>The web server software is running but no content has been added, yet.</p>
 <ul>
 % for iface in ifaces:
-    <li>${iface.name} - ${iface.addrlist}</li>
+    <li>${iface.name} - ${[str(x) for x in iface.ip4s]}</li>
 % endfor
 </ul>
 </body>