# # # delete "dbrotate.sh" # # patch "install" # from [d5fba704e4bcc10f83489ef1c584a805e2511739] # to [4b57262f502771a900d51ea540f530fc59bfa818] # # patch "skel/monotonerc" # from [474b1596ed18d7cd8d3deece139ed84d245c8351] # to [122b23da7f885efe4496224b3dd00d6a206a4785] # # patch "www/admin-source_control_backend.php" # from [916c9c6d9717504088e99d96ebdf5c37608723f6] # to [f51b654a12c5f94dfb9c75ac5d9502e4f4f4fd3f] # # patch "www/proj-ctrl.php" # from [e7d919933f83324e1d0d38e0c6e7e098f2e94227] # to [c65ef2f7bcb33c01bc6ecada0bcb6e05b09e5182] # ============================================================ --- install d5fba704e4bcc10f83489ef1c584a805e2511739 +++ install 4b57262f502771a900d51ea540f530fc59bfa818 @@ -110,12 +110,6 @@ do_install() { fi sed -e "s!CONFDIR!$CONFDIR!" \ - < dbrotate.sh > $BINDIR/$BINNAME.update-viewmtn-db.sh.new - chmod a+x $BINDIR/$BINNAME.update-viewmtn-db.sh.new - install_file $BINDIR/$BINNAME.update-viewmtn-db.sh /bin/false - - sed -e "s!DBROTATE!$BINDIR/$BINNAME.update-viewmtn-db.sh!" \ - -e "s!CONFDIR!$CONFDIR!" \ < skel/monotonerc > $CONFDIR/monotonerc.new install_file $CONFDIR/monotonerc /bin/false ============================================================ --- skel/monotonerc 474b1596ed18d7cd8d3deece139ed84d245c8351 +++ skel/monotonerc 122b23da7f885efe4496224b3dd00d6a206a4785 @@ -45,27 +45,3 @@ end function get_netsync_read_permitted(foo, bar) return true end - - - -function note_netsync_start(session_id, my_role, sync_type, remote_host, - remote_keyname, includes, excludes) - if netsync_info == nil then netsync_info = {} end - netsync_info[session_id] = "new" -end - -function note_netsync_revision_received(rid, rdat, certs, session_id) - netsync_info[session_id] = "received" -end - -function note_netsync_cert_received(rid, key, name, value, sid) - netsync_info[sid] = "received" -end - -function note_netsync_end(session_id, status, bytes_in, bytes_out, certs_in, - certs_out, revs_in, revs_out, keys_in, keys_out) - if netsync_info[session_id] == "received" then - execute("DBROTATE", "queue", get_confdir()) - end - netsync_info[session_id] = nil -end \ No newline at end of file ============================================================ --- www/admin-source_control_backend.php 916c9c6d9717504088e99d96ebdf5c37608723f6 +++ www/admin-source_control_backend.php f51b654a12c5f94dfb9c75ac5d9502e4f4f4fd3f @@ -50,8 +50,6 @@ if ($action == "getsrv") { exec("rm $projdir/database* 2>&1", $out, $res1); exec("$monotone -d $projdir/database db init 2>&1", $out, $res2); exec("chmod g+rw $projdir/database 2>&1", $out, $res3); - exec("cp $projdir/database $projdir/database.viewmtn"); - exec("cp $projdir/database $projdir/database.transfer"); if ($res2 > 0 || $res3 > 0) { $err = ""; if ($res1) $err = $err . "Remove old database failed. "; ============================================================ --- www/proj-ctrl.php e7d919933f83324e1d0d38e0c6e7e098f2e94227 +++ www/proj-ctrl.php c65ef2f7bcb33c01bc6ecada0bcb6e05b09e5182 @@ -152,10 +152,7 @@ if ($action == "new_project") { mkdir("$projwww/files-about"); symlink('../../admin.php', "$projwww/admin.php"); symlink('../../project.php', "$projwww/index.php"); - symlink('../../viewmtn', "$projwww/viewmtn"); exec("$monotone -d $projdir/database db init 2>&1", $out, $res2); - exec("cp $projdir/database $projdir/database.viewmtn"); - exec("cp $projdir/database $projdir/database.transfer"); exec("chmod ug+rwX '$projdir' '$projdir'/database* 2>&1", $out, $res3); if ($res1 || $res2 || $res3) { $errmsg = array("error" => "Internal server error", "verboseError" => $out);