apache2-sites/calcms.conf: add

move apache config to separate file

install/INSTALL.md

@@ -142,11 +142,12 @@ apt-get install <deb-package>
 
 #### Configuration
 
-edit configuration at website/config/config.cgi
+Copy the configuration from website/config/config.cgi.off to website/config/config.cgi.
+Setup the domain and database connection.
 
-Now you can connect to web gui 
+Now you can open the web gui at http://<localhost>/programm/
 
-https://<localhost>/agenda/planung/
+To edit your radio programm open http://<localhost>/agenda/planung/
 ccAdmin
 shug!3Lu
 

install/apache2-sites/calcms.conf

@@ -1,53 +1,58 @@
-# adopt your settings here
-Define domain   your-domain.org
-Define base_dir /home/calcms
-Define perl_lib /home/radio/calcms
-
-# Possible values include: debug, info, notice, warn, error, crit, alert, emerg.
 LogLevel info
-
-# limit redirection on injecting into your website
 LimitInternalRecursion 4
 
 # redirect HTTP to HTTPS,
 # only needed for HTTP configuration, do not use this at HTTPS configuration(!)
-Redirect permanent /agenda/planung https://${domain}/agenda/planung
+# Redirect permanent /agenda/planung https://${domain}/agenda/planung
 
-# inject calcms into your website
+Define domain      localhost
-Alias /agenda        ${base_dir}/website/agenda
+Define base_dir    /home/calcms/racalmas
-Alias /programm      ${base_dir}/website/programm
+Define web_dir     /home/calcms/racalmas/website/
-Alias /agenda_files  ${base_dir}/website/agenda_files
+Define perl_lib    /home/calcms/racalmas/lib
+Define archive_dir /home/radio/archive/
 
-<Directory ${base_dir}/website/agenda>
+# Redirect permanent /agenda/planung https://${domain}/agenda/planung
+# ^ remove comment to redirect HTTP to HTTPS
+# (enabling this in HTTPS templates results in endless routing loop)!
+
+# calcms endpoints for your website
+# frontend
+Alias /programm      ${web_dir}/programm
+
+# backend
+Alias /agenda        ${web_dir}/agenda
+
+# image base
+Alias /media         ${base_dir}/media
+
+# thumbs
+Alias /thumbs        ${base_dir}/media/thumbs
+
+# icons
+Alias /icons         ${base_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 ${base_dir}/website/programm>
+<Directory ${web_dir}/programm>
     AllowOverride All
     Options -Indexes +FollowSymLinks -MultiViews -ExecCGI
     Require all granted
-
-    <IfModule mod_rewrite.c>
-        RewriteBase /programm
-
-        RewriteEngine on
-        RewriteCond  %{REQUEST_FILENAME} -f
-        RewriteRule (.*) $1 [L]
-        RewriteCond  %{REQUEST_FILENAME} -d
-        RewriteRule (.*) $1 [L]
-
-        RewriteRule ^kalender/(\d{4}-\d{2}-\d{2})_(\d{4}-\d{2}-\d{2})\.html[\?]?(.*)$   /agenda/aggregate.cgi?from_date=$1&till_date=$2&$3 [L]
-        RewriteRule ^kalender/(\d{4}-\d{2}-\d{2})\.html[\?]?(.*)$                       /agenda/aggregate.cgi?date=$1&$2 [L]
-        RewriteRule ^sendungen/(\d{4}-\d{2}-\d{2})\.html[\?]?(.*)$                      /agenda/aggregate.cgi?date=$1&$2 [L]
-        RewriteRule ^sendung/(\d+)\.html[\?]?(.*)$                                      /agenda/aggregate.cgi?event_id=$1&$2 [L]
-        RewriteRule ^sendung/serie_plus/(\d+)\.html[\?]?(.*)$                           /agenda/aggregate.cgi?next_series=$1&$2 [L]
-        RewriteRule ^sendung/serie_minus/(\d+)\.html[\?]?(.*)$                          /agenda/aggregate.cgi?previous_series=$1&$2 [L]
-    </IfModule>
 </Directory>
 
-<Directory ${base_dir}/website/agenda_files>
+<Directory ${base_dir}/media>
     AllowOverride All
     Options -Indexes -FollowSymLinks -MultiViews -ExecCGI
     Require all granted

website/agenda/config/config.cgi.off

@@ -5,9 +5,8 @@ __END__
 
 <config>
 
-Define DOMAIN               my-radio.org
+Define DOMAIN               localhost
 Define BASE_DIR             /home/calcms/racalmas/website
-Define LOG_DIR              /home/calcms/log
 
 # default project from database
 project                     my-project
@@ -51,8 +50,7 @@ domain                      ${DOMAIN}
 <locations>
     temp_dir                ${BASE_DIR}/temp/
 
-    # URLs of the program page the agenda should be injected into (done by preload_agenda.pl)
+    # source website to inject calcms widgets into
-    # this is the page containing calcms_menu, and other ids
     source_url_http         http://${DOMAIN}/programm.html
     source_url_https        https://${DOMAIN}/programm.html
 
@@ -72,6 +70,7 @@ domain                      ${DOMAIN}
     local_media_dir         ${BASE_DIR}/media/
     local_media_url         /media/
     thumbs_url              /thumbs/
+    icons_url               /icons/
 
     # archives
     local_archive_dir       /home/calcms/archive/
@@ -81,12 +80,12 @@ domain                      ${DOMAIN}
     listen_dir              /home/calcms/${DOMAIN}/
     listen_url              https://${DOMAIN}/listen/
 
-    local_audio_recordings_dir ${BASE_DIR}/recordings/
+    # upload
-    local_audio_recordings_url /agenda_files/recordings/
+    local_audio_recordings_dir ${BASE_DIR}/recordings/recordings/
+    local_audio_recordings_url /recordings/
 
     # multi language support
     admin_pot_dir           ${BASE_DIR}/agenda/planung/pot/
-
     email                   info@${DOMAIN}
 </locations>
 
@@ -101,7 +100,7 @@ domain                      ${DOMAIN}
 </permissions>
 
 <access>
-    hostname                127.0.0.1
+    hostname                localhost
     port                    3306
     database                calcms
 
@@ -122,6 +121,4 @@ no_result_message           Radio ${DOMAIN}
 events_title                Radio ${DOMAIN}
 events_description          Hört mehr Radio
 
-
 </config>
-