From: Frank Brehm <frank@brehm-online.com>
Date: Sun, 6 Nov 2016 22:35:41 +0000 (+0100)
Subject: committing changes in /etc after apt run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=17f0a90ef54ae4aff3f08c1fa931de25d2efb17d;p=config%2Fns1%2Fetc.git

committing changes in /etc after apt run

Package changes:
+dbconfig-common 1.8.47+nmu3+deb8u1
+fontconfig-config 2.11.0-6.3+deb8u1
+fonts-dejavu-core 2.34-1
+javascript-common 11
+libfontconfig1 2.11.0-6.3+deb8u1
+libgd3 2.1.0-5+deb8u7
+libjbig0 2.1-3.1
+libjpeg62-turbo 1:1.3.1-12
+libjs-jquery 1.7.2+dfsg-3.2
+libjs-sphinxdoc 1.2.3+dfsg-1
+libjs-underscore 1.7.0~dfsg-1
+libltdl7 2.4.2-1.11+b1
+libmcrypt4 2.5.8-3.3
+libmysqlclient18 5.5.52-0+deb8u1
+libtiff5 4.0.3-12.3+deb8u1
+libvpx1 1.3.0-3
+libxpm4 1:3.5.11-1+b1
+php-gettext 1.0.11-1
+php-tcpdf 6.0.093+dfsg-1
+php5-gd 5.6.27+dfsg-0+deb8u1
+php5-mcrypt 5.6.27+dfsg-0+deb8u1
+php5-mysql 5.6.27+dfsg-0+deb8u1
+phpmyadmin 4:4.2.12-2+deb8u2
---

diff --git a/.etckeeper b/.etckeeper
index ff9b96b..9597d0e 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -30,6 +30,7 @@ mkdir -p './network/if-pre-up.d'
 mkdir -p './network/interfaces.d'
 mkdir -p './opt'
 mkdir -p './perl/CPAN'
+mkdir -p './phpmyadmin/conf.d'
 mkdir -p './postfix/sasl'
 mkdir -p './security/limits.d'
 mkdir -p './security/namespace.d'
@@ -54,6 +55,7 @@ maybe chmod 0644 'apache2/apache2.conf'
 maybe chmod 0755 'apache2/conf-available'
 maybe chmod 0644 'apache2/conf-available/charset.conf'
 maybe chmod 0755 'apache2/conf-available/custom-log.conf'
+maybe chmod 0644 'apache2/conf-available/javascript-common.conf'
 maybe chmod 0644 'apache2/conf-available/localized-error-pages.conf'
 maybe chmod 0644 'apache2/conf-available/other-vhosts-access-log.conf'
 maybe chmod 0644 'apache2/conf-available/security.conf'
@@ -362,6 +364,9 @@ maybe chmod 0644 'crontab'
 maybe chmod 0755 'cruft'
 maybe chmod 0755 'cruft/filters-unex'
 maybe chmod 0644 'cruft/filters-unex/etckeeper'
+maybe chmod 0755 'dbconfig-common'
+maybe chmod 0600 'dbconfig-common/config'
+maybe chmod 0600 'dbconfig-common/phpmyadmin.conf'
 maybe chmod 0755 'dbus-1'
 maybe chmod 0755 'dbus-1/system.d'
 maybe chmod 0644 'dbus-1/system.d/org.freedesktop.hostname1.conf'
@@ -630,6 +635,23 @@ maybe chmod 0755 'fail2ban/jail.d'
 maybe chmod 0644 'fail2ban/jail.d/apache-jail.conf'
 maybe chmod 0644 'fail2ban/jail.d/postfix.conf'
 maybe chmod 0644 'fail2ban/jail.d/ssh.conf'
+maybe chmod 0755 'fonts'
+maybe chmod 0755 'fonts/conf.avail'
+maybe chmod 0644 'fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf'
+maybe chmod 0644 'fonts/conf.avail/20-unhint-small-dejavu-lgc-sans.conf'
+maybe chmod 0644 'fonts/conf.avail/20-unhint-small-dejavu-lgc-serif.conf'
+maybe chmod 0644 'fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf'
+maybe chmod 0644 'fonts/conf.avail/20-unhint-small-dejavu-sans.conf'
+maybe chmod 0644 'fonts/conf.avail/20-unhint-small-dejavu-serif.conf'
+maybe chmod 0644 'fonts/conf.avail/57-dejavu-sans-mono.conf'
+maybe chmod 0644 'fonts/conf.avail/57-dejavu-sans.conf'
+maybe chmod 0644 'fonts/conf.avail/57-dejavu-serif.conf'
+maybe chmod 0644 'fonts/conf.avail/58-dejavu-lgc-sans-mono.conf'
+maybe chmod 0644 'fonts/conf.avail/58-dejavu-lgc-sans.conf'
+maybe chmod 0644 'fonts/conf.avail/58-dejavu-lgc-serif.conf'
+maybe chmod 0755 'fonts/conf.d'
+maybe chmod 0644 'fonts/conf.d/README'
+maybe chmod 0644 'fonts/fonts.conf'
 maybe chmod 0644 'fstab'
 maybe chmod 0755 'ftp-backup'
 maybe chmod 0644 'ftp-backup/backup-per-ftp.cfg'
@@ -833,6 +855,10 @@ maybe chmod 0755 'letsencrypt/renewal/ns1.uhu-banane.de-0001.conf'
 maybe chmod 0755 'letsencrypt/renewal/ns1.uhu-banane.de.conf'
 maybe chmod 0644 'lftp.conf'
 maybe chmod 0644 'libaudit.conf'
+maybe chmod 0755 'lighttpd'
+maybe chmod 0755 'lighttpd/conf-available'
+maybe chmod 0644 'lighttpd/conf-available/90-javascript-alias.conf'
+maybe chmod 0755 'lighttpd/conf-enabled'
 maybe chmod 0644 'locale.alias'
 maybe chmod 0644 'locale.gen'
 maybe chmod 0644 'locale.gen.bak'
@@ -946,10 +972,28 @@ maybe chmod 0755 'php5/cli'
 maybe chmod 0755 'php5/cli/conf.d'
 maybe chmod 0644 'php5/cli/php.ini'
 maybe chmod 0755 'php5/mods-available'
+maybe chmod 0644 'php5/mods-available/gd.ini'
 maybe chmod 0644 'php5/mods-available/json.ini'
+maybe chmod 0644 'php5/mods-available/mcrypt.ini'
+maybe chmod 0644 'php5/mods-available/mysql.ini'
+maybe chmod 0644 'php5/mods-available/mysqli.ini'
 maybe chmod 0644 'php5/mods-available/opcache.ini'
 maybe chmod 0644 'php5/mods-available/pdo.ini'
+maybe chmod 0644 'php5/mods-available/pdo_mysql.ini'
 maybe chmod 0644 'php5/mods-available/readline.ini'
+maybe chmod 0755 'phpmyadmin'
+maybe chmod 0644 'phpmyadmin/apache.conf'
+maybe chmod 0755 'phpmyadmin/conf.d'
+maybe chgrp 'www-data' 'phpmyadmin/config-db.php'
+maybe chmod 0640 'phpmyadmin/config-db.php'
+maybe chmod 0644 'phpmyadmin/config.footer.inc.php'
+maybe chmod 0644 'phpmyadmin/config.header.inc.php'
+maybe chmod 0644 'phpmyadmin/config.inc.php'
+maybe chgrp 'www-data' 'phpmyadmin/htpasswd.setup'
+maybe chmod 0640 'phpmyadmin/htpasswd.setup'
+maybe chmod 0644 'phpmyadmin/lighttpd.conf'
+maybe chmod 0644 'phpmyadmin/phpmyadmin.desktop'
+maybe chmod 0644 'phpmyadmin/phpmyadmin.service'
 maybe chmod 0755 'pm'
 maybe chmod 0755 'pm/sleep.d'
 maybe chmod 0755 'pm/sleep.d/60aiccu'
diff --git a/apache2/conf-available/javascript-common.conf b/apache2/conf-available/javascript-common.conf
new file mode 100644
index 0000000..7e5dbd3
--- /dev/null
+++ b/apache2/conf-available/javascript-common.conf
@@ -0,0 +1,5 @@
+Alias /javascript /usr/share/javascript/
+
+<Directory "/usr/share/javascript/">
+	Options FollowSymLinks MultiViews
+</Directory>
diff --git a/apache2/conf-available/phpmyadmin.conf b/apache2/conf-available/phpmyadmin.conf
new file mode 120000
index 0000000..93808ae
--- /dev/null
+++ b/apache2/conf-available/phpmyadmin.conf
@@ -0,0 +1 @@
+../../phpmyadmin/apache.conf
\ No newline at end of file
diff --git a/apache2/conf-enabled/javascript-common.conf b/apache2/conf-enabled/javascript-common.conf
new file mode 120000
index 0000000..0a4baa4
--- /dev/null
+++ b/apache2/conf-enabled/javascript-common.conf
@@ -0,0 +1 @@
+../conf-available/javascript-common.conf
\ No newline at end of file
diff --git a/apache2/conf-enabled/phpmyadmin.conf b/apache2/conf-enabled/phpmyadmin.conf
new file mode 120000
index 0000000..2baaf27
--- /dev/null
+++ b/apache2/conf-enabled/phpmyadmin.conf
@@ -0,0 +1 @@
+../conf-available/phpmyadmin.conf
\ No newline at end of file
diff --git a/dbconfig-common/config b/dbconfig-common/config
new file mode 100644
index 0000000..446478e
--- /dev/null
+++ b/dbconfig-common/config
@@ -0,0 +1,11 @@
+# dbconfig-common system-wide configuration options
+
+# dbc_remember_admin_pass: should we cache administrative passwords?
+#	set to "true" to keep admin passwords cached in debconf
+dbc_remember_admin_pass='false'
+
+# dbc_remote_questions_default: will we be likely to install on remote servers?
+#	set to "true" to raise the priority of debconf questions related to
+#   database installation on remote servers (for database types that support this)
+dbc_remote_questions_default='false'
+
diff --git a/dbconfig-common/phpmyadmin.conf b/dbconfig-common/phpmyadmin.conf
new file mode 100644
index 0000000..5c8bc57
--- /dev/null
+++ b/dbconfig-common/phpmyadmin.conf
@@ -0,0 +1,76 @@
+# automatically generated by the maintainer scripts of phpmyadmin
+# any changes you make will be preserved, though your comments
+# will be lost!  to change your settings you should edit this
+# file and then run "dpkg-reconfigure phpmyadmin"
+
+# dbc_install: configure database with dbconfig-common?
+#              set to anything but "true" to opt out of assistance
+dbc_install='false'
+
+# dbc_upgrade: upgrade database with dbconfig-common?
+#              set to anything but "true" to opt out of assistance
+dbc_upgrade='true'
+
+# dbc_remove: deconfigure database with dbconfig-common?
+#             set to anything but "true" to opt out of assistance
+dbc_remove=''
+
+# dbc_dbtype: type of underlying database to use
+#	this exists primarily to let dbconfig-common know what database
+#	type to use when a package supports multiple database types.  
+#	don't change this value unless you know for certain that this
+#	package supports multiple database types
+dbc_dbtype='mysql'
+
+# dbc_dbuser: database user
+#	the name of the user who we will use to connect to the database.
+dbc_dbuser=''
+
+# dbc_dbpass: database user password
+#	the password to use with the above username when connecting
+#	to a database, if one is required
+dbc_dbpass=''
+
+# dbc_dbserver: database host.  
+#	leave unset to use localhost (or a more efficient local method
+#	if it exists).
+dbc_dbserver=''
+
+# dbc_dbport: remote database port
+#	leave unset to use the default.  only applicable if you are
+#	using a remote database.
+dbc_dbport=''
+
+# dbc_dbname: name of database
+#	this is the name of your application's database.
+dbc_dbname=''
+
+# dbc_dbadmin: name of the administrative user
+#	this is the administrative user that is used to create all of the above
+dbc_dbadmin=''
+
+# dbc_basepath: base directory to hold database files
+#	leave unset to use the default.  only applicable if you are
+#	using a local (filesystem based) database.    
+dbc_basepath=''
+
+##
+## postgresql specific settings.  if you don't use postgresql,
+## you can safely ignore all of these
+##
+
+# dbc_ssl: should we require ssl?
+#	set to "true" to require that connections use ssl
+dbc_ssl=''
+
+# dbc_authmethod_admin: authentication method for admin
+# dbc_authmethod_user: authentication method for dbuser
+#	see the section titled "AUTHENTICATION METHODS" in
+#	/usr/share/doc/dbconfig-common/README.pgsql for more info
+dbc_authmethod_admin=''
+dbc_authmethod_user=''
+
+##
+## end postgresql specific settings
+##
+
diff --git a/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf b/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf
new file mode 100644
index 0000000..9036e83
--- /dev/null
+++ b/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-sans-mono.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu LGC Sans Mono</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans.conf b/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans.conf
new file mode 100644
index 0000000..35abebd
--- /dev/null
+++ b/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans.conf
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-sans.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu LGC Sans</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/fonts/conf.avail/20-unhint-small-dejavu-lgc-serif.conf b/fonts/conf.avail/20-unhint-small-dejavu-lgc-serif.conf
new file mode 100644
index 0000000..54486e8
--- /dev/null
+++ b/fonts/conf.avail/20-unhint-small-dejavu-lgc-serif.conf
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-serif.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu LGC Serif</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf b/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf
new file mode 100644
index 0000000..102dbcc
--- /dev/null
+++ b/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu Sans Mono</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/fonts/conf.avail/20-unhint-small-dejavu-sans.conf b/fonts/conf.avail/20-unhint-small-dejavu-sans.conf
new file mode 100644
index 0000000..ee69996
--- /dev/null
+++ b/fonts/conf.avail/20-unhint-small-dejavu-sans.conf
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu Sans</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/fonts/conf.avail/20-unhint-small-dejavu-serif.conf b/fonts/conf.avail/20-unhint-small-dejavu-serif.conf
new file mode 100644
index 0000000..cf6caa2
--- /dev/null
+++ b/fonts/conf.avail/20-unhint-small-dejavu-serif.conf
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu Serif</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/fonts/conf.avail/57-dejavu-sans-mono.conf b/fonts/conf.avail/57-dejavu-sans-mono.conf
new file mode 100644
index 0000000..cc42561
--- /dev/null
+++ b/fonts/conf.avail/57-dejavu-sans-mono.conf
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/57-dejavu-sans-mono.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu Sans Mono.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Bepa Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Prima Sans Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Sans Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu LGC Sans Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Sans Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Sans Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>DejaVu Sans Mono</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff --git a/fonts/conf.avail/57-dejavu-sans.conf b/fonts/conf.avail/57-dejavu-sans.conf
new file mode 100644
index 0000000..565cab5
--- /dev/null
+++ b/fonts/conf.avail/57-dejavu-sans.conf
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/57-dejavu-sans.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu Sans.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Arev Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bepa</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Prima Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu LGC Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Hunky Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Verajja</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <!-- In case VerajjaPDA stops declaring itself as Verajja -->
+  <alias binding="same">
+    <family>VerajjaPDA</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff --git a/fonts/conf.avail/57-dejavu-serif.conf b/fonts/conf.avail/57-dejavu-serif.conf
new file mode 100644
index 0000000..a922e9b
--- /dev/null
+++ b/fonts/conf.avail/57-dejavu-serif.conf
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/57-dejavu-serif.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu Serif.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Bitstream Prima Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu LGC Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Hunky Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <!-- In case Verajja Serif stops declaring itself as DejaVu Serif -->
+  <alias binding="same">
+    <family>Verajja Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu Serif</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff --git a/fonts/conf.avail/58-dejavu-lgc-sans-mono.conf b/fonts/conf.avail/58-dejavu-lgc-sans-mono.conf
new file mode 100644
index 0000000..9d0a8b2
--- /dev/null
+++ b/fonts/conf.avail/58-dejavu-lgc-sans-mono.conf
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/58-dejavu-lgc-sans-mono.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu LGC Sans Mono.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Bepa Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Prima Sans Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Sans Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu Sans Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Sans Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Sans Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu LGC Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>DejaVu LGC Sans Mono</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff --git a/fonts/conf.avail/58-dejavu-lgc-sans.conf b/fonts/conf.avail/58-dejavu-lgc-sans.conf
new file mode 100644
index 0000000..decd2a3
--- /dev/null
+++ b/fonts/conf.avail/58-dejavu-lgc-sans.conf
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/58-dejavu-lgc-sans.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu LGC Sans.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Arev Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bepa</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Prima Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Hunky Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Verajja</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <!-- In case VerajjaPDA stops declaring itself as Verajja -->
+  <alias binding="same">
+    <family>VerajjaPDA</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu LGC Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu LGC Sans</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff --git a/fonts/conf.avail/58-dejavu-lgc-serif.conf b/fonts/conf.avail/58-dejavu-lgc-serif.conf
new file mode 100644
index 0000000..01045e8
--- /dev/null
+++ b/fonts/conf.avail/58-dejavu-lgc-serif.conf
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/58-dejavu-lgc-serif.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu LGC Serif.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Bitstream Prima Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Hunky Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <!-- In case Verajja Serif stops declaring itself as DejaVu Serif -->
+  <alias binding="same">
+    <family>Verajja Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu LGC Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu LGC Serif</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff --git a/fonts/conf.d/10-scale-bitmap-fonts.conf b/fonts/conf.d/10-scale-bitmap-fonts.conf
new file mode 120000
index 0000000..7e50611
--- /dev/null
+++ b/fonts/conf.d/10-scale-bitmap-fonts.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
\ No newline at end of file
diff --git a/fonts/conf.d/11-lcdfilter-default.conf b/fonts/conf.d/11-lcdfilter-default.conf
new file mode 120000
index 0000000..fbc10b0
--- /dev/null
+++ b/fonts/conf.d/11-lcdfilter-default.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf
\ No newline at end of file
diff --git a/fonts/conf.d/20-unhint-small-dejavu-lgc-sans-mono.conf b/fonts/conf.d/20-unhint-small-dejavu-lgc-sans-mono.conf
new file mode 120000
index 0000000..068e8ea
--- /dev/null
+++ b/fonts/conf.d/20-unhint-small-dejavu-lgc-sans-mono.conf
@@ -0,0 +1 @@
+../conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf
\ No newline at end of file
diff --git a/fonts/conf.d/20-unhint-small-dejavu-lgc-sans.conf b/fonts/conf.d/20-unhint-small-dejavu-lgc-sans.conf
new file mode 120000
index 0000000..4c76710
--- /dev/null
+++ b/fonts/conf.d/20-unhint-small-dejavu-lgc-sans.conf
@@ -0,0 +1 @@
+../conf.avail/20-unhint-small-dejavu-lgc-sans.conf
\ No newline at end of file
diff --git a/fonts/conf.d/20-unhint-small-dejavu-lgc-serif.conf b/fonts/conf.d/20-unhint-small-dejavu-lgc-serif.conf
new file mode 120000
index 0000000..1c8a107
--- /dev/null
+++ b/fonts/conf.d/20-unhint-small-dejavu-lgc-serif.conf
@@ -0,0 +1 @@
+../conf.avail/20-unhint-small-dejavu-lgc-serif.conf
\ No newline at end of file
diff --git a/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf b/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf
new file mode 120000
index 0000000..e075245
--- /dev/null
+++ b/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf
@@ -0,0 +1 @@
+../conf.avail/20-unhint-small-dejavu-sans-mono.conf
\ No newline at end of file
diff --git a/fonts/conf.d/20-unhint-small-dejavu-sans.conf b/fonts/conf.d/20-unhint-small-dejavu-sans.conf
new file mode 120000
index 0000000..61320a1
--- /dev/null
+++ b/fonts/conf.d/20-unhint-small-dejavu-sans.conf
@@ -0,0 +1 @@
+../conf.avail/20-unhint-small-dejavu-sans.conf
\ No newline at end of file
diff --git a/fonts/conf.d/20-unhint-small-dejavu-serif.conf b/fonts/conf.d/20-unhint-small-dejavu-serif.conf
new file mode 120000
index 0000000..7abd5e1
--- /dev/null
+++ b/fonts/conf.d/20-unhint-small-dejavu-serif.conf
@@ -0,0 +1 @@
+../conf.avail/20-unhint-small-dejavu-serif.conf
\ No newline at end of file
diff --git a/fonts/conf.d/20-unhint-small-vera.conf b/fonts/conf.d/20-unhint-small-vera.conf
new file mode 120000
index 0000000..cde2cce
--- /dev/null
+++ b/fonts/conf.d/20-unhint-small-vera.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf
\ No newline at end of file
diff --git a/fonts/conf.d/30-metric-aliases.conf b/fonts/conf.d/30-metric-aliases.conf
new file mode 120000
index 0000000..1880d96
--- /dev/null
+++ b/fonts/conf.d/30-metric-aliases.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/30-metric-aliases.conf
\ No newline at end of file
diff --git a/fonts/conf.d/30-urw-aliases.conf b/fonts/conf.d/30-urw-aliases.conf
new file mode 120000
index 0000000..2a3d2f4
--- /dev/null
+++ b/fonts/conf.d/30-urw-aliases.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/30-urw-aliases.conf
\ No newline at end of file
diff --git a/fonts/conf.d/40-nonlatin.conf b/fonts/conf.d/40-nonlatin.conf
new file mode 120000
index 0000000..c46eb4e
--- /dev/null
+++ b/fonts/conf.d/40-nonlatin.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/40-nonlatin.conf
\ No newline at end of file
diff --git a/fonts/conf.d/45-latin.conf b/fonts/conf.d/45-latin.conf
new file mode 120000
index 0000000..cb1c08f
--- /dev/null
+++ b/fonts/conf.d/45-latin.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/45-latin.conf
\ No newline at end of file
diff --git a/fonts/conf.d/49-sansserif.conf b/fonts/conf.d/49-sansserif.conf
new file mode 120000
index 0000000..2625516
--- /dev/null
+++ b/fonts/conf.d/49-sansserif.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/49-sansserif.conf
\ No newline at end of file
diff --git a/fonts/conf.d/50-user.conf b/fonts/conf.d/50-user.conf
new file mode 120000
index 0000000..62f8b14
--- /dev/null
+++ b/fonts/conf.d/50-user.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/50-user.conf
\ No newline at end of file
diff --git a/fonts/conf.d/51-local.conf b/fonts/conf.d/51-local.conf
new file mode 120000
index 0000000..39557bd
--- /dev/null
+++ b/fonts/conf.d/51-local.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/51-local.conf
\ No newline at end of file
diff --git a/fonts/conf.d/57-dejavu-sans-mono.conf b/fonts/conf.d/57-dejavu-sans-mono.conf
new file mode 120000
index 0000000..c0c1959
--- /dev/null
+++ b/fonts/conf.d/57-dejavu-sans-mono.conf
@@ -0,0 +1 @@
+../conf.avail/57-dejavu-sans-mono.conf
\ No newline at end of file
diff --git a/fonts/conf.d/57-dejavu-sans.conf b/fonts/conf.d/57-dejavu-sans.conf
new file mode 120000
index 0000000..92a40d6
--- /dev/null
+++ b/fonts/conf.d/57-dejavu-sans.conf
@@ -0,0 +1 @@
+../conf.avail/57-dejavu-sans.conf
\ No newline at end of file
diff --git a/fonts/conf.d/57-dejavu-serif.conf b/fonts/conf.d/57-dejavu-serif.conf
new file mode 120000
index 0000000..b7e7481
--- /dev/null
+++ b/fonts/conf.d/57-dejavu-serif.conf
@@ -0,0 +1 @@
+../conf.avail/57-dejavu-serif.conf
\ No newline at end of file
diff --git a/fonts/conf.d/58-dejavu-lgc-sans-mono.conf b/fonts/conf.d/58-dejavu-lgc-sans-mono.conf
new file mode 120000
index 0000000..89ea6b2
--- /dev/null
+++ b/fonts/conf.d/58-dejavu-lgc-sans-mono.conf
@@ -0,0 +1 @@
+../conf.avail/58-dejavu-lgc-sans-mono.conf
\ No newline at end of file
diff --git a/fonts/conf.d/58-dejavu-lgc-sans.conf b/fonts/conf.d/58-dejavu-lgc-sans.conf
new file mode 120000
index 0000000..ca377e0
--- /dev/null
+++ b/fonts/conf.d/58-dejavu-lgc-sans.conf
@@ -0,0 +1 @@
+../conf.avail/58-dejavu-lgc-sans.conf
\ No newline at end of file
diff --git a/fonts/conf.d/58-dejavu-lgc-serif.conf b/fonts/conf.d/58-dejavu-lgc-serif.conf
new file mode 120000
index 0000000..603352a
--- /dev/null
+++ b/fonts/conf.d/58-dejavu-lgc-serif.conf
@@ -0,0 +1 @@
+../conf.avail/58-dejavu-lgc-serif.conf
\ No newline at end of file
diff --git a/fonts/conf.d/60-latin.conf b/fonts/conf.d/60-latin.conf
new file mode 120000
index 0000000..020a763
--- /dev/null
+++ b/fonts/conf.d/60-latin.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/60-latin.conf
\ No newline at end of file
diff --git a/fonts/conf.d/65-fonts-persian.conf b/fonts/conf.d/65-fonts-persian.conf
new file mode 120000
index 0000000..c5ceafc
--- /dev/null
+++ b/fonts/conf.d/65-fonts-persian.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/65-fonts-persian.conf
\ No newline at end of file
diff --git a/fonts/conf.d/65-nonlatin.conf b/fonts/conf.d/65-nonlatin.conf
new file mode 120000
index 0000000..eee5d46
--- /dev/null
+++ b/fonts/conf.d/65-nonlatin.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/65-nonlatin.conf
\ No newline at end of file
diff --git a/fonts/conf.d/69-unifont.conf b/fonts/conf.d/69-unifont.conf
new file mode 120000
index 0000000..313ab54
--- /dev/null
+++ b/fonts/conf.d/69-unifont.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/69-unifont.conf
\ No newline at end of file
diff --git a/fonts/conf.d/70-no-bitmaps.conf b/fonts/conf.d/70-no-bitmaps.conf
new file mode 120000
index 0000000..dbfc647
--- /dev/null
+++ b/fonts/conf.d/70-no-bitmaps.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/70-no-bitmaps.conf
\ No newline at end of file
diff --git a/fonts/conf.d/80-delicious.conf b/fonts/conf.d/80-delicious.conf
new file mode 120000
index 0000000..e2d1d22
--- /dev/null
+++ b/fonts/conf.d/80-delicious.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/80-delicious.conf
\ No newline at end of file
diff --git a/fonts/conf.d/90-synthetic.conf b/fonts/conf.d/90-synthetic.conf
new file mode 120000
index 0000000..20e176b
--- /dev/null
+++ b/fonts/conf.d/90-synthetic.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/90-synthetic.conf
\ No newline at end of file
diff --git a/fonts/conf.d/README b/fonts/conf.d/README
new file mode 100644
index 0000000..6a774c5
--- /dev/null
+++ b/fonts/conf.d/README
@@ -0,0 +1,23 @@
+conf.d/README
+
+Each file in this directory is a fontconfig configuration file.  Fontconfig
+scans this directory, loading all files of the form [0-9][0-9]*.conf.
+These files are normally installed in /usr/share/fontconfig/conf.avail
+and then symlinked here, allowing them to be easily installed and then
+enabled/disabled by adjusting the symlinks.
+
+The files are loaded in numeric order, the structure of the configuration
+has led to the following conventions in usage:
+
+ Files begining with:	Contain:
+ 
+ 00 through 09		Font directories
+ 10 through 19		system rendering defaults (AA, etc)
+ 20 through 29		font rendering options
+ 30 through 39		family substitution
+ 40 through 49		generic identification, map family->generic
+ 50 through 59		alternate config file loading
+ 60 through 69		generic aliases, map generic->family
+ 70 through 79		select font (adjust which fonts are available)
+ 80 through 89		match target="scan" (modify scanned patterns)
+ 90 through 99		font synthesis
diff --git a/fonts/fonts.conf b/fonts/fonts.conf
new file mode 100644
index 0000000..e3a004b
--- /dev/null
+++ b/fonts/fonts.conf
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+
+<!--
+	DO NOT EDIT THIS FILE.
+	IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
+	LOCAL CHANGES BELONG IN 'local.conf'.
+
+	The intent of this standard configuration file is to be adequate for
+	most environments.  If you have a reasonably normal environment and
+	have found problems with this configuration, they are probably
+	things that others will also want fixed.  Please submit any
+	problems to the fontconfig bugzilla system located at fontconfig.org
+
+	Note that the normal 'make install' procedure for fontconfig is to
+	replace any existing fonts.conf file with the new version.  Place
+	any local customizations in local.conf which this file references.
+
+	Keith Packard
+-->
+
+<!-- Font directory list -->
+
+	<dir>/usr/share/fonts</dir>
+	<dir>/usr/X11R6/lib/X11/fonts</dir> <dir>/usr/local/share/fonts</dir>
+	<dir prefix="xdg">fonts</dir>
+	<!-- the following element will be removed in the future -->
+	<dir>~/.fonts</dir>
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>monospace</string>
+		</edit>
+	</match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Load local system customization file
+-->
+	<include ignore_missing="yes">conf.d</include>
+
+<!-- Font cache directory list -->
+
+	<cachedir>/var/cache/fontconfig</cachedir>
+	<cachedir prefix="xdg">fontconfig</cachedir>
+	<!-- the following element will be removed in the future -->
+	<cachedir>~/.fontconfig</cachedir>
+
+	<config>
+<!--
+  These are the default Unicode chars that are expected to be blank
+  in fonts.  All other blank chars are assumed to be broken and
+  won't appear in the resulting charsets
+ -->
+		<blank>
+			<int>0x0020</int>	<!-- SPACE -->
+			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
+			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
+			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
+			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
+			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
+			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
+			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
+			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
+			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
+			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
+			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
+			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
+			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
+			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
+			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
+			<int>0x2000</int>	<!-- EN QUAD -->
+			<int>0x2001</int>	<!-- EM QUAD -->
+			<int>0x2002</int>	<!-- EN SPACE -->
+			<int>0x2003</int>	<!-- EM SPACE -->
+			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
+			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
+			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
+			<int>0x2007</int>	<!-- FIGURE SPACE -->
+			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
+			<int>0x2009</int>	<!-- THIN SPACE -->
+			<int>0x200A</int>	<!-- HAIR SPACE -->
+			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
+			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
+			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
+			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
+			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
+			<int>0x2028</int>	<!-- LINE SEPARATOR -->
+			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
+			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
+			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
+			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
+			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
+			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
+			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
+			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
+			<int>0x2060</int>	<!-- WORD JOINER -->
+			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
+			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
+			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
+			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
+			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
+			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
+			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
+			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
+			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
+			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
+			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
+			<int>0x3164</int>	<!-- HANGUL FILLER -->
+			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
+			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
+			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
+			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
+			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
+		</blank>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+		<rescan>
+			<int>30</int>
+		</rescan>
+	</config>
+
+</fontconfig>
diff --git a/lighttpd/conf-available/90-javascript-alias.conf b/lighttpd/conf-available/90-javascript-alias.conf
new file mode 100644
index 0000000..a8b442f
--- /dev/null
+++ b/lighttpd/conf-available/90-javascript-alias.conf
@@ -0,0 +1 @@
+alias.url += ("/javascript" => "/usr/share/javascript")
diff --git a/lighttpd/conf-enabled/90-javascript-alias.conf b/lighttpd/conf-enabled/90-javascript-alias.conf
new file mode 120000
index 0000000..dc909f6
--- /dev/null
+++ b/lighttpd/conf-enabled/90-javascript-alias.conf
@@ -0,0 +1 @@
+../conf-available/90-javascript-alias.conf
\ No newline at end of file
diff --git a/php5/apache2/conf.d/20-gd.ini b/php5/apache2/conf.d/20-gd.ini
new file mode 120000
index 0000000..1beea2e
--- /dev/null
+++ b/php5/apache2/conf.d/20-gd.ini
@@ -0,0 +1 @@
+../../mods-available/gd.ini
\ No newline at end of file
diff --git a/php5/apache2/conf.d/20-mcrypt.ini b/php5/apache2/conf.d/20-mcrypt.ini
new file mode 120000
index 0000000..6faac1c
--- /dev/null
+++ b/php5/apache2/conf.d/20-mcrypt.ini
@@ -0,0 +1 @@
+../../mods-available/mcrypt.ini
\ No newline at end of file
diff --git a/php5/apache2/conf.d/20-mysql.ini b/php5/apache2/conf.d/20-mysql.ini
new file mode 120000
index 0000000..272d53b
--- /dev/null
+++ b/php5/apache2/conf.d/20-mysql.ini
@@ -0,0 +1 @@
+../../mods-available/mysql.ini
\ No newline at end of file
diff --git a/php5/apache2/conf.d/20-mysqli.ini b/php5/apache2/conf.d/20-mysqli.ini
new file mode 120000
index 0000000..00f1c92
--- /dev/null
+++ b/php5/apache2/conf.d/20-mysqli.ini
@@ -0,0 +1 @@
+../../mods-available/mysqli.ini
\ No newline at end of file
diff --git a/php5/apache2/conf.d/20-pdo_mysql.ini b/php5/apache2/conf.d/20-pdo_mysql.ini
new file mode 120000
index 0000000..576055f
--- /dev/null
+++ b/php5/apache2/conf.d/20-pdo_mysql.ini
@@ -0,0 +1 @@
+../../mods-available/pdo_mysql.ini
\ No newline at end of file
diff --git a/php5/cli/conf.d/20-gd.ini b/php5/cli/conf.d/20-gd.ini
new file mode 120000
index 0000000..1beea2e
--- /dev/null
+++ b/php5/cli/conf.d/20-gd.ini
@@ -0,0 +1 @@
+../../mods-available/gd.ini
\ No newline at end of file
diff --git a/php5/cli/conf.d/20-mcrypt.ini b/php5/cli/conf.d/20-mcrypt.ini
new file mode 120000
index 0000000..6faac1c
--- /dev/null
+++ b/php5/cli/conf.d/20-mcrypt.ini
@@ -0,0 +1 @@
+../../mods-available/mcrypt.ini
\ No newline at end of file
diff --git a/php5/cli/conf.d/20-mysql.ini b/php5/cli/conf.d/20-mysql.ini
new file mode 120000
index 0000000..272d53b
--- /dev/null
+++ b/php5/cli/conf.d/20-mysql.ini
@@ -0,0 +1 @@
+../../mods-available/mysql.ini
\ No newline at end of file
diff --git a/php5/cli/conf.d/20-mysqli.ini b/php5/cli/conf.d/20-mysqli.ini
new file mode 120000
index 0000000..00f1c92
--- /dev/null
+++ b/php5/cli/conf.d/20-mysqli.ini
@@ -0,0 +1 @@
+../../mods-available/mysqli.ini
\ No newline at end of file
diff --git a/php5/cli/conf.d/20-pdo_mysql.ini b/php5/cli/conf.d/20-pdo_mysql.ini
new file mode 120000
index 0000000..576055f
--- /dev/null
+++ b/php5/cli/conf.d/20-pdo_mysql.ini
@@ -0,0 +1 @@
+../../mods-available/pdo_mysql.ini
\ No newline at end of file
diff --git a/php5/mods-available/gd.ini b/php5/mods-available/gd.ini
new file mode 100644
index 0000000..d6993ae
--- /dev/null
+++ b/php5/mods-available/gd.ini
@@ -0,0 +1,3 @@
+; configuration for php GD module
+; priority=20
+extension=gd.so
diff --git a/php5/mods-available/mcrypt.ini b/php5/mods-available/mcrypt.ini
new file mode 100644
index 0000000..adc0df1
--- /dev/null
+++ b/php5/mods-available/mcrypt.ini
@@ -0,0 +1,3 @@
+; configuration for php MCrypt module
+; priority=20
+extension=mcrypt.so
diff --git a/php5/mods-available/mysql.ini b/php5/mods-available/mysql.ini
new file mode 100644
index 0000000..d4afd21
--- /dev/null
+++ b/php5/mods-available/mysql.ini
@@ -0,0 +1,3 @@
+; configuration for php MySQL module
+; priority=20
+extension=mysql.so
diff --git a/php5/mods-available/mysqli.ini b/php5/mods-available/mysqli.ini
new file mode 100644
index 0000000..26e79a3
--- /dev/null
+++ b/php5/mods-available/mysqli.ini
@@ -0,0 +1,3 @@
+; configuration for php MySQL module
+; priority=20
+extension=mysqli.so
diff --git a/php5/mods-available/pdo_mysql.ini b/php5/mods-available/pdo_mysql.ini
new file mode 100644
index 0000000..777b5a6
--- /dev/null
+++ b/php5/mods-available/pdo_mysql.ini
@@ -0,0 +1,3 @@
+; configuration for php MySQL module
+; priority=20
+extension=pdo_mysql.so
diff --git a/phpmyadmin/apache.conf b/phpmyadmin/apache.conf
new file mode 100644
index 0000000..3bcc4fb
--- /dev/null
+++ b/phpmyadmin/apache.conf
@@ -0,0 +1,47 @@
+# phpMyAdmin default Apache configuration
+
+Alias /phpmyadmin /usr/share/phpmyadmin
+
+<Directory /usr/share/phpmyadmin>
+    Options FollowSymLinks
+    DirectoryIndex index.php
+
+    <IfModule mod_php5.c>
+        <IfModule mod_mime.c>
+            AddType application/x-httpd-php .php
+        </IfModule>
+        <FilesMatch ".+\.php$">
+            SetHandler application/x-httpd-php
+        </FilesMatch>
+
+        php_flag magic_quotes_gpc Off
+        php_flag track_vars On
+        php_flag register_globals Off
+        php_admin_flag allow_url_fopen Off
+        php_value include_path .
+        php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp
+        php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext/:/usr/share/javascript/:/usr/share/php/tcpdf/
+    </IfModule>
+
+</Directory>
+
+# Authorize for setup
+<Directory /usr/share/phpmyadmin/setup>
+    <IfModule mod_authz_core.c>
+        <IfModule mod_authn_file.c>
+            AuthType Basic
+            AuthName "phpMyAdmin Setup"
+            AuthUserFile /etc/phpmyadmin/htpasswd.setup
+        </IfModule>
+        Require valid-user
+    </IfModule>
+</Directory>
+
+# Disallow web access to directories that don't need it
+<Directory /usr/share/phpmyadmin/libraries>
+    Require all denied
+</Directory>
+<Directory /usr/share/phpmyadmin/setup/lib>
+    Require all denied
+</Directory>
+
diff --git a/phpmyadmin/config-db.php b/phpmyadmin/config-db.php
new file mode 100644
index 0000000..6f9debc
--- /dev/null
+++ b/phpmyadmin/config-db.php
@@ -0,0 +1,19 @@
+<?php
+##
+## database access settings in php format
+## automatically generated from /etc/dbconfig-common/phpmyadmin.conf
+## by /usr/sbin/dbconfig-generate-include
+## Sun, 06 Nov 2016 23:35:40 +0100
+##
+## by default this file is managed via ucf, so you shouldn't have to
+## worry about manual changes being silently discarded.  *however*,
+## you'll probably also want to edit the configuration file mentioned
+## above too.
+##
+$dbuser='';
+$dbpass='';
+$basepath='';
+$dbname='';
+$dbserver='';
+$dbport='';
+$dbtype='mysql';
diff --git a/phpmyadmin/config.footer.inc.php b/phpmyadmin/config.footer.inc.php
new file mode 100644
index 0000000..3613c2f
--- /dev/null
+++ b/phpmyadmin/config.footer.inc.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Debian local configuration file
+ *
+ * In this file you may add PHP or HTML statements that will be used to define
+ * the footer for phpMyAdmin pages.
+ */
+
diff --git a/phpmyadmin/config.header.inc.php b/phpmyadmin/config.header.inc.php
new file mode 100644
index 0000000..d5d3ace
--- /dev/null
+++ b/phpmyadmin/config.header.inc.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Debian local configuration file
+ *
+ * In this file you may add PHP or HTML statements that will be used to define
+ * the header for phpMyAdmin pages.
+ */
+
diff --git a/phpmyadmin/config.inc.php b/phpmyadmin/config.inc.php
new file mode 100644
index 0000000..b3bbc40
--- /dev/null
+++ b/phpmyadmin/config.inc.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Debian local configuration file
+ *
+ * This file overrides the settings made by phpMyAdmin interactive setup
+ * utility.
+ *
+ * For example configuration see
+ *   /usr/share/doc/phpmyadmin/examples/config.sample.inc.php
+ * or
+ *   /usr/share/doc/phpmyadmin/examples/config.manyhosts.inc.php
+ *
+ * NOTE: do not add security sensitive data to this file (like passwords)
+ * unless you really know what you're doing. If you do, any user that can
+ * run PHP or CGI on your webserver will be able to read them. If you still
+ * want to do this, make sure to properly secure the access to this file
+ * (also on the filesystem level).
+ */
+
+if (!function_exists('check_file_access')) {
+    function check_file_access($path)
+    {
+        if (is_readable($path)) {
+            return true;
+        } else {
+            error_log(
+                'phpmyadmin: Failed to load ' . $path
+                . ' Check group www-data has read access and open_basedir restrictions.'
+            );
+            return false;
+        }
+    }
+}
+
+// Load secret generated on postinst
+if (check_file_access('/var/lib/phpmyadmin/blowfish_secret.inc.php')) {
+    require('/var/lib/phpmyadmin/blowfish_secret.inc.php');
+}
+
+// Load autoconf local config
+if (check_file_access('/var/lib/phpmyadmin/config.inc.php')) {
+    require('/var/lib/phpmyadmin/config.inc.php');
+}
+
+/**
+ * Server(s) configuration
+ */
+$i = 0;
+// The $cfg['Servers'] array starts with $cfg['Servers'][1].  Do not use $cfg['Servers'][0].
+// You can disable a server config entry by setting host to ''.
+$i++;
+
+/**
+ * Read configuration from dbconfig-common
+ * You can regenerate it using: dpkg-reconfigure -plow phpmyadmin
+ */
+if (check_file_access('/etc/phpmyadmin/config-db.php')) {
+    require('/etc/phpmyadmin/config-db.php');
+}
+
+/* Configure according to dbconfig-common if enabled */
+if (!empty($dbname)) {
+    /* Authentication type */
+    $cfg['Servers'][$i]['auth_type'] = 'cookie';
+    /* Server parameters */
+    if (empty($dbserver)) $dbserver = 'localhost';
+    $cfg['Servers'][$i]['host'] = $dbserver;
+
+    if (!empty($dbport) || $dbserver != 'localhost') {
+        $cfg['Servers'][$i]['connect_type'] = 'tcp';
+        $cfg['Servers'][$i]['port'] = $dbport;
+    }
+    //$cfg['Servers'][$i]['compress'] = false;
+    /* Select mysqli if your server has it */
+    $cfg['Servers'][$i]['extension'] = 'mysqli';
+    /* Optional: User for advanced features */
+    $cfg['Servers'][$i]['controluser'] = $dbuser;
+    $cfg['Servers'][$i]['controlpass'] = $dbpass;
+    /* Optional: Advanced phpMyAdmin features */
+    $cfg['Servers'][$i]['pmadb'] = $dbname;
+    $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
+    $cfg['Servers'][$i]['relation'] = 'pma__relation';
+    $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
+    $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
+    $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
+    $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
+    $cfg['Servers'][$i]['history'] = 'pma__history';
+    $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
+    $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
+    $cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords';
+    $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
+    $cfg['Servers'][$i]['recent'] = 'pma__recent';
+    $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
+    $cfg['Servers'][$i]['users'] = 'pma__users';
+    $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
+    $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
+    $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
+
+    /* Uncomment the following to enable logging in to passwordless accounts,
+     * after taking note of the associated security risks. */
+    // $cfg['Servers'][$i]['AllowNoPassword'] = TRUE;
+
+    /* Advance to next server for rest of config */
+    $i++;
+}
+
+/* Authentication type */
+//$cfg['Servers'][$i]['auth_type'] = 'cookie';
+/* Server parameters */
+//$cfg['Servers'][$i]['host'] = 'localhost';
+//$cfg['Servers'][$i]['connect_type'] = 'tcp';
+//$cfg['Servers'][$i]['compress'] = false;
+/* Select mysqli if your server has it */
+//$cfg['Servers'][$i]['extension'] = 'mysql';
+/* Optional: User for advanced features */
+// $cfg['Servers'][$i]['controluser'] = 'pma';
+// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
+
+/* Storage database and tables */
+// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
+// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
+// $cfg['Servers'][$i]['relation'] = 'pma__relation';
+// $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
+// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
+// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
+// $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
+// $cfg['Servers'][$i]['history'] = 'pma__history';
+// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
+// $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
+// $cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords';
+// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
+// $cfg['Servers'][$i]['recent'] = 'pma__recent';
+// $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
+// $cfg['Servers'][$i]['users'] = 'pma__users';
+// $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
+// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
+// $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
+/* Uncomment the following to enable logging in to passwordless accounts,
+ * after taking note of the associated security risks. */
+// $cfg['Servers'][$i]['AllowNoPassword'] = TRUE;
+
+/*
+ * End of servers configuration
+ */
+
+/*
+ * Directories for saving/loading files from server
+ */
+$cfg['UploadDir'] = '';
+$cfg['SaveDir'] = '';
+
+/* Support additional configurations */
+foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename)
+{
+    include($filename);
+}
+
+
diff --git a/phpmyadmin/htpasswd.setup b/phpmyadmin/htpasswd.setup
new file mode 100644
index 0000000..01c4abd
--- /dev/null
+++ b/phpmyadmin/htpasswd.setup
@@ -0,0 +1 @@
+admin:*
diff --git a/phpmyadmin/lighttpd.conf b/phpmyadmin/lighttpd.conf
new file mode 100644
index 0000000..deb852f
--- /dev/null
+++ b/phpmyadmin/lighttpd.conf
@@ -0,0 +1,27 @@
+# Alias for phpMyAdmin directory
+alias.url += ( 
+	"/phpmyadmin" => "/usr/share/phpmyadmin",
+)
+
+# Disallow access to libraries
+$HTTP["url"] =~ "^/phpmyadmin/libraries" { 
+    url.access-deny = ( "" ) 
+}
+$HTTP["url"] =~ "^/phpmyadmin/setup/lib" { 
+    url.access-deny = ( "" ) 
+}
+
+# Limit access to setup script
+$HTTP["url"] =~ "^/phpmyadmin/setup" {
+	auth.backend = "htpasswd"
+	auth.backend.htpasswd.userfile = "/etc/phpmyadmin/htpasswd.setup"
+	auth.require = (
+		"/" => (
+			"method" => "basic",
+			"realm" => "phpMyAdmin Setup",
+			"require" => "valid-user"
+		)
+	)
+}
+
+
diff --git a/phpmyadmin/phpmyadmin.desktop b/phpmyadmin/phpmyadmin.desktop
new file mode 100644
index 0000000..f9f71e3
--- /dev/null
+++ b/phpmyadmin/phpmyadmin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=phpMyAdmin
+Comment=MySQL management over web
+Exec=sensible-browser http://localhost/phpmyadmin/
+Terminal=false
+Type=Application
+Icon=phpmyadmin
+Categories=Development;Database;
diff --git a/phpmyadmin/phpmyadmin.service b/phpmyadmin/phpmyadmin.service
new file mode 100644
index 0000000..077c926
--- /dev/null
+++ b/phpmyadmin/phpmyadmin.service
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone='no'?>
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+ <name replace-wildcards="yes">phpMyAdmin on %h</name>
+  <service>
+   <type>_http._tcp</type>
+   <port>80</port>
+   <txt-record>path=/phpmyadmin/</txt-record>
+  </service>
+</service-group>