From 5295dfd1735a8e32e7ca671b2b6b9af93c7dc743 Mon Sep 17 00:00:00 2001
From: Milan <mc@radiopiloten.de>
Date: Tue, 28 Mar 2023 21:12:59 +0200
Subject: [PATCH] apache config

adopt directories to following structure

/aganda
/programm
/media
/media/thumbs
/media/icons
/media/images
/media/internal
/media/internal/thumbs
/media/internal/images
/meida/internal/icons
/thumbs -> /media/thumbs
/icons  -> /media/icons
---
 install/apache2-sites/calcms.conf    |  8 +--
 install/apache2-sites/coloradio.conf | 74 ++++++++++++++++++++++++++++
 website/.htaccess                    |  3 --
 website/media/icons/.htaccess        |  7 +--
 website/media/images/.htaccess       |  7 +--
 website/media/thumbs/.htaccess       |  7 +--
 6 files changed, 81 insertions(+), 25 deletions(-)
 create mode 100644 install/apache2-sites/coloradio.conf
 delete mode 100644 website/.htaccess

diff --git a/install/apache2-sites/calcms.conf b/install/apache2-sites/calcms.conf
index 2341144..589dc20 100644
--- a/install/apache2-sites/calcms.conf
+++ b/install/apache2-sites/calcms.conf
@@ -23,16 +23,16 @@ Alias /programm      ${web_dir}/programm
 Alias /agenda        ${web_dir}/agenda
 
 # image base
-Alias /media         ${base_dir}/media
+Alias /media         ${web_dir}/media
 
 # thumbs
-Alias /thumbs        ${base_dir}/media/thumbs
+Alias /thumbs        ${web_dir}/media/thumbs
 
 # icons
-Alias /icons         ${base_dir}/media/icons
+Alias /icons         ${web_dir}/media/icons
 
 # audio upload
-Alias /recordings    ${base_dir}/recordings
+Alias /recordings    ${web_dir}/recordings
 
 # audio download
 Alias /listen        ${archive_dir}/${domain}
diff --git a/install/apache2-sites/coloradio.conf b/install/apache2-sites/coloradio.conf
new file mode 100644
index 0000000..0981368
--- /dev/null
+++ b/install/apache2-sites/coloradio.conf
@@ -0,0 +1,74 @@
+# Possible values include: debug, info, notice, warn, error, crit, alert, emerg.
+LogLevel info
+
+# limit redirection on injecting into your website
+LimitInternalRecursion 4
+
+Define domain      localhost
+Define base_dir    /home/milan/radio/coloradio/racalmas.orig/
+Define perl_lib    /home/milan/radio/coloradio/racalmas.orig/lib/calcms
+Define web_dir     /home/milan/radio/coloradio/racalmas.orig/website/
+Define archive_dir /home/radio/archive/
+
+# calcms endpoints for your website
+# frontend
+Alias /programm      ${web_dir}/programm
+
+# backend
+Alias /agenda        ${web_dir}/agenda
+
+# image base
+Alias /media         ${web_dir}/media
+
+# thumbs
+Alias /thumbs        ${web_dir}/media/thumbs
+
+# icons
+Alias /icons         ${web_dir}/media/icons
+
+# audio upload
+Alias /recordings    ${base_dir}/recordings
+
+# audio download
+Alias /listen        ${archive_dir}/${domain}
+
+# upload playout status
+ScriptAlias /agenda/planung/upload  ${archive_dir}/${domain}/agenda/planung/upload
+
+<Directory ${web_dir}/agenda>
+    AllowOverride All
+    Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
+    Require all granted
+</Directory>
+
+<Directory ${web_dir}/programm>
+    AllowOverride All
+    Options -Indexes +FollowSymLinks -MultiViews -ExecCGI
+    Require all granted
+</Directory>
+
+<Directory ${web_dir}/media>
+    AllowOverride All
+    Options -Indexes -FollowSymLinks -MultiViews -ExecCGI
+    Require all granted
+</Directory>
+
+<IfModule mod_perl.c>
+    PerlSetEnv LC_ALL   en_US.UTF-8
+    PerlSetEnv LANGUAGE en_US.UTF-8
+
+    PerlWarn On
+    PerlModule ModPerl::RegistryPrefork
+
+    PerlModule Apache2::Reload
+    PerlInitHandler Apache2::Reload
+
+    # set local tmp dir
+    SetEnv TMPDIR ${base_dir}/tmp/
+
+    # set library directory
+    PerlSetEnv PERL5LIB ${base_dir}/lib/calcms/
+
+    # preload libraries
+    PerlPostConfigRequire ${base_dir}/lib/calcms/startup.pl
+</IfModule>
diff --git a/website/.htaccess b/website/.htaccess
deleted file mode 100644
index ad29c31..0000000
--- a/website/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-
-redirectMatch 301 ^/$ 	/agenda/
-
diff --git a/website/media/icons/.htaccess b/website/media/icons/.htaccess
index 651c4ee..754e331 100644
--- a/website/media/icons/.htaccess
+++ b/website/media/icons/.htaccess
@@ -1,7 +1,2 @@
 Options -Indexes +FollowSymLinks +MultiViews -ExecCGI
-
-<IfModule mod_expires.c>
-ExpiresActive On
-ExpiresDefault "access plus 5 minutes"
-</IfModule>
-
+Require all granted
diff --git a/website/media/images/.htaccess b/website/media/images/.htaccess
index 651c4ee..754e331 100644
--- a/website/media/images/.htaccess
+++ b/website/media/images/.htaccess
@@ -1,7 +1,2 @@
 Options -Indexes +FollowSymLinks +MultiViews -ExecCGI
-
-<IfModule mod_expires.c>
-ExpiresActive On
-ExpiresDefault "access plus 5 minutes"
-</IfModule>
-
+Require all granted
diff --git a/website/media/thumbs/.htaccess b/website/media/thumbs/.htaccess
index 651c4ee..754e331 100644
--- a/website/media/thumbs/.htaccess
+++ b/website/media/thumbs/.htaccess
@@ -1,7 +1,2 @@
 Options -Indexes +FollowSymLinks +MultiViews -ExecCGI
-
-<IfModule mod_expires.c>
-ExpiresActive On
-ExpiresDefault "access plus 5 minutes"
-</IfModule>
-
+Require all granted