5 files changed, 133 insertions, 0 deletions
diff --git a/mkosi.extra/etc/apache2/mods-available/mpm_prefork.conf b/mkosi.extra/etc/apache2/mods-available/mpm_prefork.conf
new file mode 100644
index 0000000..73ceafc
--- /dev/null
+++ b/mkosi.extra/etc/apache2/mods-available/mpm_prefork.conf
@@ -0,0 +1,16 @@
+# prefork MPM
+# StartServers: number of server processes to start
+# MinSpareServers: minimum number of server processes which are kept spare
+# MaxSpareServers: maximum number of server processes which are kept spare
+# MaxRequestWorkers: maximum number of server processes allowed to start
+# MaxConnectionsPerChild: maximum number of requests a server process serves
+
+<IfModule mpm_prefork_module>
+	StartServers			 1
+	MinSpareServers		  1
+	MaxSpareServers		 10
+	MaxRequestWorkers	  75
+	MaxConnectionsPerChild   0
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/mkosi.extra/etc/apache2/ports.conf b/mkosi.extra/etc/apache2/ports.conf
new file mode 100644
index 0000000..1ec7806
--- /dev/null
+++ b/mkosi.extra/etc/apache2/ports.conf
@@ -0,0 +1,4 @@
+Listen 127.0.0.1:8301
+Listen [::1]:8301
+
+# vim: syntax=apache ts=4 sw=4 sr noet
diff --git a/mkosi.extra/etc/apache2/sites-available/davical.conf b/mkosi.extra/etc/apache2/sites-available/davical.conf
new file mode 100644
index 0000000..c7f4b62
--- /dev/null
+++ b/mkosi.extra/etc/apache2/sites-available/davical.conf
@@ -0,0 +1,70 @@
+<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>
+
+
+
diff --git a/mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades b/mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades
new file mode 100644
index 0000000..4c725ab
--- /dev/null
+++ b/mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades
@@ -0,0 +1,9 @@
+APT::Periodic::Unattended-Upgrade "1";
+
+APT::Periodic::Update-Package-Lists "1";
+
+
+APT::Periodic::AutocleanInterval "7";
+
+
+
diff --git a/mkosi.extra/etc/apt/apt.conf.d/50unattended-upgrades b/mkosi.extra/etc/apt/apt.conf.d/50unattended-upgrades
new file mode 100644
index 0000000..768347b
--- /dev/null
+++ b/mkosi.extra/etc/apt/apt.conf.d/50unattended-upgrades
@@ -0,0 +1,34 @@
+// Unattended-Upgrade::Origins-Pattern controls which packages are
+// upgraded.
+Unattended-Upgrade::Origins-Pattern {
+      "origin=Ubuntu,archive=${distro_codename}-security";
+      "o=Ubuntu,a=${distro_codename}";
+      "o=Ubuntu,a=${distro_codename}-updates";
+      "o=Ubuntu,a=${distro_codename}-proposed-updates";
+      "o=Ubuntu,n=${distro_codename}-backports";
+  };
+
+// List of packages to not update (regexp are supported)
+Unattended-Upgrade::Package-Blacklist {
+};
+
+
+// Split the upgrade into the smallest possible chunks so that
+// they can be interrupted with SIGUSR1. This makes the upgrade
+// a bit slower but it has the benefit that shutdown while a upgrade
+// is running is possible (with a small delay)
+Unattended-Upgrade::MinimalSteps "true";
+
+
+// Do automatic removal of new unused dependencies after the upgrade
+// (equivalent to apt-get autoremove)
+Unattended-Upgrade::Remove-Unused-Dependencies "true";
+
+
+// Do upgrade application even if it requires restart after upgrade
+// I.e. "XB-Upgrade-Requires: app-restart" is set in the debian/control file
+Unattended-Upgrade::IgnoreAppsRequireRestart "true";
+
+// Automatically run "dpkg --force-confold --configure -a".
+Unattended-Upgrade::AutoFixInterruptedDpkg "true";
+