7 files changed, 4 insertions, 58 deletions
diff --git a/rpkid/Makefile b/rpkid/Makefile
index c6fe9e63..bda940ce 100644
--- a/rpkid/Makefile
+++ b/rpkid/Makefile
@@ -2,8 +2,8 @@
 
 all: rpki/relaxng.py
 
-rpki/relaxng.py: make-relaxng.py left-right-schema.rng up-down-schema.rng publication-schema.rng
-	python make-relaxng.py >$@.tmp
+rpki/relaxng.py: ../scripts/make-relaxng.py left-right-schema.rng up-down-schema.rng publication-schema.rng
+	python ../scripts/make-relaxng.py >$@.tmp
 	mv $@.tmp $@
 
 left-right-schema.rng: left-right-schema.rnc
diff --git a/rpkid/cronjob.sh b/rpkid/doc/cronjob.sh
index 3aabdf95..975f0ba2 100755
--- a/rpkid/cronjob.sh
+++ b/rpkid/doc/cronjob.sh
@@ -21,12 +21,12 @@ lock=cronjob.lock
 
 target=/usr/local/www/data/www.hactrn.net/rpki-dox
 
-cd `/usr/bin/dirname $0` || exit
+cd `/usr/bin/dirname $0`/.. || exit
 
 case "$1" in
 
 locked)
-    exec >cronjob.log 2>&1
+    exec >doc/cronjob.log 2>&1
     set -x
     export PATH=/bin:/usr/bin:/usr/local/bin
     /usr/local/bin/svn update --quiet
diff --git a/rpkid/make-relaxng.py b/rpkid/make-relaxng.py
deleted file mode 100644
index 62decbae..00000000
--- a/rpkid/make-relaxng.py
+++ /dev/null
@@ -1,54 +0,0 @@
-"""
-Script to generate rpki/relaxng.py.
-
-$Id$
-
-Copyright (C) 2009  Internet Systems Consortium ("ISC")
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Portions copyright (C) 2007--2008  American Registry for Internet Numbers ("ARIN")
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS.  IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-"""
-
-schemas = ("left_right", "up_down", "publication")
-
-format_1 = """\
-# Automatically generated, do not edit.
-
-import lxml.etree
-"""
-
-format_2 = """\
-## @var %(name)s
-## Parsed RelaxNG %(name)s schema
-%(name)s = lxml.etree.RelaxNG(lxml.etree.fromstring('''%(rng)s'''))
-"""
-
-print format_1
-
-for name in schemas:
-  print format_2 % {
-    "name" : name,
-    "rng"  : open(name.replace("_", "-") + "-schema.rng").read() }
diff --git a/rpkid/rootd.yaml b/rpkid/tests/rootd.yaml
index 2ee5dcd4..2ee5dcd4 100644
--- a/rpkid/rootd.yaml
+++ b/rpkid/tests/rootd.yaml
diff --git a/rpkid/testpoke.py b/rpkid/tests/testpoke.py
index 949cd464..949cd464 100644
--- a/rpkid/testpoke.py
+++ b/rpkid/tests/testpoke.py
diff --git a/rpkid/testpoke.xsl b/rpkid/tests/testpoke.xsl
index 91658b0b..91658b0b 100644
--- a/rpkid/testpoke.xsl
+++ b/rpkid/tests/testpoke.xsl
diff --git a/rpkid/testpoke.yaml b/rpkid/tests/testpoke.yaml
index 22e2d35f..22e2d35f 100644
--- a/rpkid/testpoke.yaml
+++ b/rpkid/tests/testpoke.yaml