Current state

diff --git a/apache2/vhosts.d/02_morph.conf b/apache2/vhosts.d/02_morph.conf
index c64ac2adcadf314cb9d8667692cdc2fd264e79b6..da18fedfd10ac3dd72d3eb0a3e08fa7cc644a18b 100644 (file)
--- a/apache2/vhosts.d/02_morph.conf
+++ b/apache2/vhosts.d/02_morph.conf
@@ -38,24 +38,4 @@
 
 </VirtualHost>
 
-<VirtualHost *:80>
-
-    ServerName piwik.bmrmorph.de
-    ServerAlias www.piwik.bmrmorph.de
-
-    DocumentRoot /home/morph/htdocs/piwik.bmrmorph.de
-
-    ErrorLog /var/log/apache2/morph-error.log
-    LogLevel warn
-    CustomLog /var/log/apache2/morph-access.log full
-
-    <Directory "/home/morph/htdocs/piwik.bmrmorph.de">
-        Options -Indexes FollowSymLinks
-        AllowOverride None
-        Order allow,deny
-        Allow from all
-    </Directory>
-
-</VirtualHost>
-
 # vim: ts=4 filetype=apache

diff --git a/cron.hourly/rsync-git.sh b/cron.hourly/rsync-git.sh
new file mode 100644 (file)
index 0000000..009262c
--- /dev/null
+++ b/cron.hourly/rsync-git.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -d /var/lib/git ] ; then
+    rsync -aH /var/lib/git uhu1.uhu-banane.de:/var/lib/
+fi
+
+# vim: ts=4 expandtab

diff --git a/group b/group
index 25e19abaf9b3d229835d92649a4ad23312e94e03..559e8b54afa8747e0573ad5a8d9b556387044f43 100644 (file)
--- a/group
+++ b/group
@@ -14,7 +14,7 @@ mail:x:12:mail,postfix
 news:x:13:news
 uucp:x:14:uucp
 man:x:15:man
-cron:x:16:frank,taurec,morph,patrick,vivi,minecraft
+cron:x:16:frank,taurec,morph,patrick,vivi
 console:x:17:frank,taurec
 audio:x:18:frank,taurec
 cdrom:x:19:
@@ -57,7 +57,6 @@ git:x:996:
 openvpn:x:997:
 clamav:x:998:
 amavis:x:999:clamav
-minecraft:x:1002:
 proftpd:x:1008:
 vmail:x:1023:
 nogroup:x:65533:

diff --git a/passwd b/passwd
index 2cbeefa3e99ead854a51242c7940e6982e52c5be..f885970b77f1ba78ba117b6a55202642a5c147b6 100644 (file)
--- a/passwd
+++ b/passwd
@@ -40,7 +40,6 @@ ldap:x:439:439:added by portage for openldap:/usr/lib64/openldap:/sbin/nologin
 nobody:x:65534:65534:nobody:/var/empty:/bin/false
 taurec:x:1000:100:Jörn Valentin:/home/taurec:/bin/bash
 morph:x:1001:100:Daniel Wendler:/home/morph:/bin/bash
-minecraft:x:1002:1002:minecraft server:/home/minecraft:/bin/bash
 patrick:x:1004:100:Patrick Hennig:/home/patrick:/bin/bash
 vivi:x:1006:100:Vivien Winkler:/home/vivi:/bin/bash
 frank:x:1017:100:Frank Brehm:/home/frank:/bin/bash

diff --git a/shadow b/shadow
index bb4eaccdf411592248f8fffbff236c714bda1359..a318e1413e8f7423378903375bb0ff56b4538752 100644 (file)
--- a/shadow
+++ b/shadow
@@ -40,7 +40,6 @@ ldap:!:15544::::::
 nobody:*:9797:0:::::
 taurec:$1$aIByn.zw$HuqtNPuXReU4CqFQ21D0m1:14754:0:99999:7:::
 morph:$1$VXZ6JKs.$5BFb1vxIPcpV8qvfGU9721:14756:0:99999:7:::
-minecraft:!:15220:0:99999:7:::
 patrick:$6$cayHKFTo$y3plIUQem6gONYo/D.VqfmcUJRgJ08lxWKzr.Q2NYw9P6BWOGLFgNi6HyWQ8sCjR9Ky7cWvBULtyxJG4xq2Bq1:14756:0:99999:7:::
 vivi:$6$XgM4lbim$X2/XVS1Ymb1g0jDaoEFXaBvBRGpTFEk/PwZabvj1f2fRClMCJi4wDW1yOE2ScY6DBwmk9rHfykwI2u5WFgMe..:14756:0:99999:7:::
 frank:$6$DFnYHGpc$8YQInxXqQjHzWX/1m3xCeK8Myr1t4NoehN.HYeSrdVQU6IAr7BTjgn4yex.eTTSWysqnfGQxXe5yE.P4aIn8p.:14758:0:99999:7:::