server setup filled out and moved

2 files changed, 42 insertions, 19 deletions

diff --git a/software/server-setup b/software/server-setup
new file mode 100644
index 0000000..0000465
--- /dev/null
+++ b/software/server-setup
@@ -0,0 +1,42 @@
+=========================================
+Generic Server Setup Tricks
+=========================================
+
+See also `debian </k/software/debian>`__ and 
+`freebsd tricks </k/software/freebsd-tricks>`__.
+
+bind
+-------------
+You probably want to hide your bind verison name to prevent scanning and 
+attacks. Edit ``/etc/bind/named.conf`` or ``/etc/bind/named.conf.options``
+and add this line to the options block::
+
+    version "Withheld";
+
+ntp
+------------
+ntp servers listen on port 37. 
+
+File Hierarchy
+------------------
+/srv/
+    Root for server files, scripts, and databases
+
+/srv/http/
+    Subdirectories for each virtual host live in this folder, out of which
+    static `HTTP </k/software/http>`__ content is served.
+
+/srv/django/
+    Django applications and their databases live in here.
+
+/srv/git/
+    Bare git repositories are stored here; those with a file 
+    ``git-daemon-export-ok`` get served up through a web interface and can be
+    publically cloned.
+
+/srv/
+    SVN repository roots are stored in sub folder in here.
+
+/srv/python/
+    Standalone python scripts and applications are stored in here (not Django
+    apps).
diff --git a/tmp/server setup b/tmp/server setup
deleted file mode 100644
index 472e3a9..0000000
--- a/tmp/server setup
+++ /dev/null
@@ -1,19 +0,0 @@
-=========================================
-Generic Server Setup Tricks
-=========================================
-
-See also `debian </k/software/debian>`__.
-
-bind
--------------
-You probably want to hide your bind verison name to prevent scanning and 
-attacks. Edit ``/etc/bind/named.conf`` or ``/etc/bind/named.conf.options``
-and add this line to the options block::
-
-    version "Withheld";
-
-ntp
-------------
-ntp servers listen on port 37. 
-
-