diff options
| -rw-r--r-- | rpkid/examples/rpki.conf | 2 | ||||
| -rw-r--r-- | rpkid/examples/rsyncd.conf | 4 | ||||
| -rw-r--r-- | scripts/convert-from-csv-to-entitydb.py | 4 | ||||
| -rw-r--r-- | scripts/convert-https-to-http.py | 4 | ||||
| -rw-r--r-- | scripts/setup-rootd.sh | 2 | ||||
| -rw-r--r-- | scripts/test-myrpki-cms.py | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/rpkid/examples/rpki.conf b/rpkid/examples/rpki.conf index 711e3fb6..d2e881df 100644 --- a/rpkid/examples/rpki.conf +++ b/rpkid/examples/rpki.conf @@ -1,6 +1,6 @@ ################################################################ # -# $Id: myrpki.conf 2722 2009-08-31 22:24:48Z sra $ +# $Id$ # # Config file for myrpki.py and RPKI daemons. # diff --git a/rpkid/examples/rsyncd.conf b/rpkid/examples/rsyncd.conf index fabb5aa2..1bb60324 100644 --- a/rpkid/examples/rsyncd.conf +++ b/rpkid/examples/rsyncd.conf @@ -11,11 +11,11 @@ # # "myname" is the rsync module name to configure, as in # "rsync://rpki.example.org/rpki/"; see the publication_rsync_module -# parameter in myrpki.conf +# parameter in rpki.conf # # "/some/where/publication" is the absolute pathname of the directory # where you told pubd to place its outputs; see the -# publication_base_directory parameter in myrpki.conf. +# publication_base_directory parameter in rpki.conf. # # You may need to adjust other parameters for your system environment. # diff --git a/scripts/convert-from-csv-to-entitydb.py b/scripts/convert-from-csv-to-entitydb.py index efcb14d2..41147815 100644 --- a/scripts/convert-from-csv-to-entitydb.py +++ b/scripts/convert-from-csv-to-entitydb.py @@ -26,8 +26,8 @@ from lxml.etree import Element, SubElement, ElementTree section_regexp = re.compile("\s*\[\s*(.+?)\s*\]\s*$") variable_regexp = re.compile("\s*([-a-zA-Z0-9_]+)(\s*=\s*)(.+?)\s*$") -cfg_file = "myrpki.conf" -template_file = os.path.join(os.path.dirname(sys.argv[0]), "examples", "myrpki.conf") +cfg_file = "rpki.conf" +template_file = os.path.join(os.path.dirname(sys.argv[0]), "examples", "rpki.conf") new_cfg_file = None preserve_valid_until = False diff --git a/scripts/convert-https-to-http.py b/scripts/convert-https-to-http.py index 94f5ad5c..68c0725c 100644 --- a/scripts/convert-https-to-http.py +++ b/scripts/convert-https-to-http.py @@ -6,7 +6,7 @@ Usage: python convert-https-to-http.py [ { -c | --config } configfile ] [ { -e | --entitydb } entitydbdir ] [ { -h | --help } ] -Default configuration file is myrpki.conf, override with --config option. +Default configuration file is rpki.conf, override with --config option. $Id$ @@ -27,7 +27,7 @@ PERFORMANCE OF THIS SOFTWARE. import getopt, sys, os, warnings, lxml.etree, rpki.config -cfg_file = "myrpki.conf" +cfg_file = "rpki.conf" entitydb_dir = "entitydb" convert_sql = True diff --git a/scripts/setup-rootd.sh b/scripts/setup-rootd.sh index 001ed862..41a271b8 100644 --- a/scripts/setup-rootd.sh +++ b/scripts/setup-rootd.sh @@ -28,7 +28,7 @@ export BPKI_DIRECTORY=`pwd`/bpki/servers openssl=../openssl/openssl/apps/openssl -$openssl ca -notext -batch -config myrpki.conf \ +$openssl ca -notext -batch -config rpki.conf \ -ss_cert bpki/resources/ca.cer \ -out $BPKI_DIRECTORY/child.cer \ -extensions ca_x509_ext_xcert0 diff --git a/scripts/test-myrpki-cms.py b/scripts/test-myrpki-cms.py index 0ea59c07..f2947f5c 100644 --- a/scripts/test-myrpki-cms.py +++ b/scripts/test-myrpki-cms.py @@ -38,7 +38,7 @@ f.close() rpki.myrpki.openssl = "/u/sra/rpki/subvert-rpki.hactrn.net/openssl/openssl/apps/openssl" os.putenv("OPENSSL_CONF", "/dev/null") -bpki = rpki.myrpki.CA("test/Alice/myrpki.conf", "test/Alice/bpki/resources") +bpki = rpki.myrpki.CA("test/Alice/rpki.conf", "test/Alice/bpki/resources") bpki.ee("/CN=Alice Signed Referral CMS Test EE Certificate", "CMSEE") # "id-ct-xml" from rpki.oids |