From a815c9963e2ce39d19ca0249e80a796af901f720 Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy@turnkeylinux.org>
Date: Fri, 14 Aug 2026 17:09:18 +1000
Subject: [PATCH] Fix a myriad of papercut issues...

---
 conf.d/main                                      | 16 +++++++++-------
 .../templates/Pages => }/turnkey-shim.php        |  0
 2 files changed, 9 insertions(+), 7 deletions(-)
 rename overlay/var/www/{cakephp/templates/Pages => }/turnkey-shim.php (100%)

diff --git a/conf.d/main b/conf.d/main
index 4249aaa..bf5a0d9 100755
--- a/conf.d/main
+++ b/conf.d/main
@@ -1,22 +1,24 @@
 #!/bin/bash -ex
 
 WEBROOT=/var/www/cakephp
+# webroot dir created by cakephp composer install
 
-# set up base dir permissions
-mkdir -p $WEBROOT
-chown -R www-data:www-data $WEBROOT
 # temporarily allow www-data write access to /var/www (only)
 chown www-data /var/www # note not recursive
 
 # set up turnkey-composer
 sed -i "\|HOME_FALLBACK=|s|=.*|=/var/www/.composer|" /usr/local/bin/turnkey-composer
 sed -i "\|APP_ROOT_FALLBACK=|s|=.*|=$WEBROOT|" /usr/local/bin/turnkey-composer
+mkdir -p /var/www/.composer
+chown -R www-data /var/www/.composer
 
 # install cakephp app skeleton for TKL example app
-turnkey-composer create-project --no-interaction --prefer-dist cakephp/app cakephp
+APP_ROOT=/var/www turnkey-composer create-project --no-interaction --prefer-dist cakephp/app cakephp
 # return root ownership of /var/www
 chown root /var/www # note not recursive
 
+mv /var/www/turnkey-shim.php "$WEBROOT"/templates/Pages/
+
 # initial config
 CONF=$WEBROOT/config/app_local.php
 APP=cakephp
@@ -62,8 +64,8 @@ NEW_STR="Replace $HOME to see your own custom page here"
 sed -i "\|<small>|s|>.*</|>$NEW_STR</|" $HOME
 
 # insert custom TKL html (turnkey-shim.php in overlay)
-sed "\|<small>|{n;a\<?php include 'turnkey-shim.php' ?>
-}"
+sed -i "\|<small>|{n;a\<?php include 'turnkey-shim.php' ?>
+}" $HOME
 
 # turn on assertions to avoid cakephp warning
 sed -i '/^zend\.assertions/ s|-1$|1|' /etc/php/8.?/{cli,apache2}/php.ini
@@ -73,5 +75,5 @@ chmod 640 $CONF
 
 # configure apache
 a2dissite 000-default
-a2ensite tkl-cakephp
+a2ensite cakephp
 a2enmod rewrite
diff --git a/overlay/var/www/cakephp/templates/Pages/turnkey-shim.php b/overlay/var/www/turnkey-shim.php
similarity index 100%
rename from overlay/var/www/cakephp/templates/Pages/turnkey-shim.php
rename to overlay/var/www/turnkey-shim.php