mkosi.exstra seems like a better solution than mkosi.skeleton

1 files changed, 0 insertions, 70 deletions

diff --git a/mkosi.skeleton/root/apache2.davical.conf b/mkosi.skeleton/root/apache2.davical.conf
deleted file mode 100644
index c7f4b62..0000000
--- a/mkosi.skeleton/root/apache2.davical.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-<VirtualHost *:8301>
-
-    ServerName #APACHE_SERVER_NAME
-    UseCanonicalName on
-
-    DocumentRoot /usr/share/davical/htdocs
-    DirectoryIndex index.php index.html
-
-    # To cirkumvent phps $_SERVER['HTTPS']-check
-    SetEnv HTTPS "on"
-
-    AcceptPathInfo On
-
-    # For some weird reason, apache2 doesn't set this automatically
-    SetEnv AUTH_TYPE Basic
-
-    # Trust the remote user forwarded by nginx
-    SetEnvIf X-Forwarded-User (.*) REMOTE_USER=$1
-
-    <Directory /usr/share/davical/htdocs>
-        DirectoryIndex index.php
-        AllowOverride None
-        # for Apache from 2.4 use
-        Require all granted
-        # for Apache before 2.4 use
-        #Order allow,deny
-        #Allow from all
-      
-        # These are usually not necessary (set correctly by default)
-        #AcceptPathInfo On
-        #php_value include_path /usr/share/php/awl/inc
-        #php_value magic_quotes_gpc 0
-        #php_value register_globals 0
-        #php_value error_reporting "E_ALL & ~E_NOTICE"
-        #php_value default_charset "utf-8"
-      
-        # Some people want this. YMMV.
-        #php_admin_value open_basedir /usr/share/awl/inc/:/usr/share/davical/:/etc/davical/
-    </Directory>
-
-    <IfModule mod_rewrite.c>
-        RewriteEngine On
-      
-        # PT is important if you are using an alias, it implies L
-        # Redirect /.well-known URLs
-        RewriteRule ^/\.well-known/(.*)$ /caldav.php/.well-known/$1 [NC,PT]
-        # Optionally: redirect /principals/users/ as well
-        RewriteRule ^/principals/users/(.*)$ /caldav.php/$1 [NC,PT]
-        RewriteRule ^/principals/resources/(.*)$ /caldav.php/$1 [NC,PT]
-        RewriteRule ^/calendars/__uids__/(.*)$ /caldav.php/$1 [NC,PT]
-        RewriteRule ^/addressbooks/__uids__/(.*)$ /caldav.php/$1 [NC,PT]
-      
-        # Optionally: Put DAViCal in the root
-        # NOTE: this will break other applications that rely on mod_rewrite!
-        #
-        # Not if it's the root URL.  You might want to comment this out if you
-        # want to use an explicit /index.php for getting to the admin pages.
-        #RewriteCond %{REQUEST_URI} !^/$
-        #RewriteCond %{REQUEST_URI} !^/davical/$
-        #
-        # Not if it explicitly specifies a .php program, html page, stylesheet or image
-        #RewriteCond %{REQUEST_URI} !\.(php|html|css|js|png|gif|jpg|ico)
-        #
-        # Everything else gets rewritten to /caldav.php/...
-        #RewriteRule ^(.*)$ /davical/caldav.php$1  [NC,L]
-    </IfModule>
-</VirtualHost>
-
-
-