diff options
| -rw-r--r-- | buildtools/build-ubuntu-ports.py | 10 | ||||
| -rw-r--r-- | buildtools/debian-skeleton/rpki-ca.install | 2 | ||||
| -rw-r--r-- | rpkid/Makefile.in | 2 | ||||
| -rw-r--r-- | rpkid/rpki-confgen.xml | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/buildtools/build-ubuntu-ports.py b/buildtools/build-ubuntu-ports.py index 5c73a4a6..858ca259 100644 --- a/buildtools/build-ubuntu-ports.py +++ b/buildtools/build-ubuntu-ports.py @@ -31,7 +31,15 @@ import os version = "0." + subprocess.check_output(("svnversion", "-c")).strip().split(":")[-1] -shutil.copytree("buildtools/debian-skeleton", "debian") +if os.path.exists("debian"): + shutil.rmtree("debian") + +def ignore_dot_svn(src, names): + return [name for name in names if name == ".svn"] + +shutil.copytree("buildtools/debian-skeleton", "debian", ignore = ignore_dot_svn) + +os.chmod("debian/rules", 0755) subprocess.check_call(("dch", "--create", "--package", "rpki", "--newversion", version, "Version %s of https://subvert-rpki.hactrn.net/trunk/" % version), diff --git a/buildtools/debian-skeleton/rpki-ca.install b/buildtools/debian-skeleton/rpki-ca.install index f59e2c00..2a68ddb3 100644 --- a/buildtools/debian-skeleton/rpki-ca.install +++ b/buildtools/debian-skeleton/rpki-ca.install @@ -1,7 +1,5 @@ etc/rpki.conf.sample etc/rpki/apache.conf -etc/rpki/default_settings.py -etc/rpki/settings.py usr/lib usr/sbin usr/share diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 3d2438ae..35b26617 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -210,7 +210,7 @@ examples/rpki.conf: rpki/autoconf.py rpki-confgen.py rpki-confgen.xml --set myrpki::handle=`hostname -f | sed 's/[.]/_/g'` \ --set myrpki::rpkid_server_host=`hostname -f` \ --set myrpki::pubd_server_host=`hostname -f` \ - --set web_portal::django-secret-key=`${GENERATE_DJANGO_SECRET_KEY}` \ + --set web_portal::secret-key=`${GENERATE_DJANGO_SECRET_KEY}` \ --write-conf $@ install:: diff --git a/rpkid/rpki-confgen.xml b/rpkid/rpki-confgen.xml index 135b94e2..b92b4ae4 100644 --- a/rpkid/rpki-confgen.xml +++ b/rpkid/rpki-confgen.xml @@ -718,7 +718,7 @@ </doc> </option> - <option name = "django-secret-key" + <option name = "secret-key" value = ""> <doc> Site-specific secret key for Django. |