move monotone server stuff into own subdir

monotone/monotone-setup.sh

@@ -18,7 +18,7 @@ case "$cmd" in
         #   determine server address
         server_address="$1"
         if [ ".$server_address" = . ]; then
-           server_address=`@l_shtool@ echo -e "mtn-serve@%h%d"`
+            server_address=`@l_shtool@ echo -e "mtn-serve@%h%d"`
         fi
         echo "++ server address: \"$server_address\""
 
@@ -37,49 +37,52 @@ case "$cmd" in
         chmod 664 @l_prefix@/var/monotone/monotone.db
 
         #   generate server key
-        echo "++ generating server key \"@l_prefix@/etc/monotone/keys/$server_address\""
-        mkdir @l_prefix@/etc/monotone/keys 2>&1 || true
-        chown @l_rusr@:@l_rgrp@ @l_prefix@/etc/monotone/keys
-        chmod 775 @l_prefix@/etc/monotone/keys
+        echo "++ generating server key \"@l_prefix@/etc/monotone/monotone-server/keys/$server_address\""
+        mkdir @l_prefix@/etc/monotone/monotone-server 2>&1 || true
+        mkdir @l_prefix@/etc/monotone/monotone-server/keys 2>&1 || true
+        chown @l_rusr@:@l_rgrp@ @l_prefix@/etc/monotone/monotone-server/keys
+        chmod 775 @l_prefix@/etc/monotone/monotone-server/keys
         ( echo "$server_password"
           echo "$server_password"
         ) | @l_prefix@/bin/mtn \
-            --keydir="@l_prefix@/etc/monotone/keys/" \
+            --keydir="@l_prefix@/etc/monotone/monotone-server/keys/" \
             genkey "$server_address" >/dev/null 2>&1
-        chown @l_rusr@:@l_rgrp@ "@l_prefix@/etc/monotone/keys/$server_address"
-        chmod 664 "@l_prefix@/etc/monotone/keys/$server_address"
+        chown @l_rusr@:@l_rgrp@ "@l_prefix@/etc/monotone/monotone-server/keys/$server_address"
+        chmod 664 "@l_prefix@/etc/monotone/monotone-server/keys/$server_address"
 
         #   setting up ACLs
-        echo "++ setting up server ACLs \"@l_prefix@/etc/monotone/{read,write}-permissions\""
+        echo "++ setting up server ACLs \"@l_prefix@/etc/monotone/monotone-server/{read,write}-permissions\""
         ( echo "comment \"provide read access to everyone except anonymous/nil\""
           echo "pattern \"*\""
           echo "deny \"nil\""
           echo "allow \"*\""
-        ) >@l_prefix@/etc/monotone/read-permissions
+        ) >@l_prefix@/etc/monotone/monotone-server/read-permissions
         ( echo "*"
-        ) >@l_prefix@/etc/monotone/write-permissions
-        chown @l_rusr@:@l_rgrp@ @l_prefix@/etc/monotone/read-permissions
-        chown @l_rusr@:@l_rgrp@ @l_prefix@/etc/monotone/write-permissions
-        chmod 600 @l_prefix@/etc/monotone/read-permissions
-        chmod 600 @l_prefix@/etc/monotone/write-permissions
+        ) >@l_prefix@/etc/monotone/monotone-server/write-permissions
+        chown @l_rusr@:@l_rgrp@ @l_prefix@/etc/monotone/monotone-server/read-permissions
+        chown @l_rusr@:@l_rgrp@ @l_prefix@/etc/monotone/monotone-server/write-permissions
+        chmod 600 @l_prefix@/etc/monotone/monotone-server/read-permissions
+        chmod 600 @l_prefix@/etc/monotone/monotone-server/write-permissions
 
         #   setting up configuration script
-        echo "++ setting up server configuration script \"@l_prefix@/etc/monotone/monotonerc\""
+        echo "++ setting up server configuration script \"@l_prefix@/etc/monotone/monotone-server/monotonerc\""
         ( echo "function get_passphrase(keypair_id)"
           echo "    return \"$server_password\""
           echo "end"
-        ) >@l_prefix@/etc/monotone/monotonerc
-        chown @l_rusr@:@l_rgrp@ @l_prefix@/etc/monotone/monotonerc
-        chmod 600 @l_prefix@/etc/monotone/monotonerc
+        ) >@l_prefix@/etc/monotone/monotone-server/monotonerc
+        chown @l_rusr@:@l_rgrp@ @l_prefix@/etc/monotone/monotone-server/monotonerc
+        chmod 600 @l_prefix@/etc/monotone/monotone-server/monotonerc
         ;;
 
     uninstall )
         #   remove server and database related files
         echo "++ removing server and database related files"
-        rm -f @l_prefix@/etc/monotone/monotonerc 2>&1 || true
-        rm -f @l_prefix@/etc/monotone/read-permissions 2>&1 || true
-        rm -f @l_prefix@/etc/monotone/write-permissions 2>&1 || true
-        rm -rf @l_prefix@/etc/monotone/keys 2>&1 || true
+        rm -f @l_prefix@/etc/monotone/monotone-server/monotonerc 2>&1 || true
+        rm -f @l_prefix@/etc/monotone/monotone-server/read-permissions 2>&1 || true
+        rm -f @l_prefix@/etc/monotone/monotone-server/write-permissions 2>&1 || true
+        rm -f @l_prefix@/etc/monotone/monotone-server/keys/* 2>&1 || true
+        rmdir @l_prefix@/etc/monotone/monotone-server/keys 2>&1 || true
+        rmdir @l_prefix@/etc/monotone/monotone-server 2>&1 || true
         rm -f @l_prefix@/var/monotone/monotone.db 2>&1 || true
         ;;
 esac

monotone/rc.monotone

@@ -17,8 +17,8 @@
 
 %common
     monotone_daemon_etcdir="@l_prefix@/etc/monotone"
-    monotone_daemon_pidfile="@l_prefix@/var/monotone/monotone.pid"
-    monotone_daemon_logfile="@l_prefix@/var/monotone/monotone.log"
+    monotone_daemon_pidfile="@l_prefix@/var/monotone/monotone-server.pid"
+    monotone_daemon_logfile="@l_prefix@/var/monotone/monotone-server.log"
     monotone_signal () {
         [ -f $monotone_daemon_pidfile ] && kill -$1 `cat $monotone_daemon_pidfile`
     }
@@ -37,8 +37,8 @@
     rcService monotone active yes && exit 0
     if rcVarIsYes monotone_daemon; then
         ( nohup @l_prefix@/bin/mtn \
-            --confdir="$monotone_daemon_etcdir" \
-            --keydir="$monotone_daemon_etcdir/keys" \
+            --confdir="$monotone_daemon_etcdir/monotone-server" \
+            --keydir="$monotone_daemon_etcdir//monotone-server/keys" \
             --log="$monotone_daemon_logfile" \
             --db="$monotone_daemon_dbfile" \
             serve \