From 119ca50f4a86da82d68c12e6828b9f65e91e8006 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Tue, 21 Feb 2017 01:07:38 +0100 Subject: [PATCH] upd: cleanup more references Change-Id: I132ad32bfe54e6714128ffea9cf2619a09c85885 --- LICENSE.BSD | 2 +- README.md | 2 +- config/gigi.properties.template | 4 ++-- config/test.properties.template | 13 +++++-------- doc/scripts/gigi | 4 ++-- keys/generateTruststore.sh | 8 +------- .../pages/account/certs/CertificateIssueForm.templ | 2 +- src/club/wpia/gigi/pages/wot/Rules.templ | 2 +- util-testing/club/wpia/gigi/DevelLauncher.java | 2 +- util/club/wpia/gigi/util/DatabaseManager.java | 2 +- 10 files changed, 16 insertions(+), 25 deletions(-) diff --git a/LICENSE.BSD b/LICENSE.BSD index b7bf085a..d9562405 100644 --- a/LICENSE.BSD +++ b/LICENSE.BSD @@ -1,4 +1,4 @@ -Copyright (c) 2015, CAcert +Copyright (c) 2015, WPIA All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md index e4267e76..bfaf25b6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Gigi ================= -Webserver Module for CAcert +Webserver Module for running an open Certificate Autority Contains source from jetty 9.1.0.RC0 diff --git a/config/gigi.properties.template b/config/gigi.properties.template index c65fd414..2f511ec1 100644 --- a/config/gigi.properties.template +++ b/config/gigi.properties.template @@ -7,8 +7,8 @@ http.port=80 emailProvider=club.wpia.gigi.email.CommandlineEmailProvider sql.driver=org.postgresql.Driver #sql.driver=com.mysql.jdbc.Driver -sql.url=jdbc:postgresql://localhost/cacert -#sql.url=jdbc:mysql://localhost:3306/cacert +sql.url=jdbc:postgresql://localhost/gigi +#sql.url=jdbc:mysql://localhost:3306/gigi sql.user= sql.password= diff --git a/config/test.properties.template b/config/test.properties.template index 5a63cab9..c57f99a4 100644 --- a/config/test.properties.template +++ b/config/test.properties.template @@ -6,7 +6,7 @@ mail=localhost:8474 # ==== OR === type=autonomous -java=java -cp bin;/path/to/mysqlConnector.jar org.cacert.gigi.TestLauncher +java=java -cp bin;/path/to/postgresConnector.jar club.wpia.gigi.TestLauncher serverPort.https=4443 serverPort.http=8098 mailPort=8473 @@ -15,15 +15,12 @@ mailPort=8473 # ==== ALL === -name.static=static.cacert.local -name.secure=secure.cacert.local -name.www=www.cacert.local -name.api=api.cacert.local +name.suffix=wpia.local sql.driver=org.postgresql.Driver #sql.driver=com.mysql.jdbc.Driver -sql.url=jdbc:postgresql://localhost/cacert -#sql.url=jdbc:mysql://localhost:3306/cacert -sql.user=cacert +sql.url=jdbc:postgresql://localhost/gigi +#sql.url=jdbc:mysql://localhost:3306/gigi +sql.user=gigi sql.password= diff --git a/doc/scripts/gigi b/doc/scripts/gigi index ba3677e0..733a940c 100755 --- a/doc/scripts/gigi +++ b/doc/scripts/gigi @@ -35,7 +35,7 @@ case "$command" in start) runGigiClass Launcher ;; debug) runGigiClass Launcher "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000" ;; start-daemon) - exec 3>/var/log/wpia-gigi.log || die 'open log' runGigiClass Launcher <&3 >&4 2>&1 & echo $! > /var/run/wpia-gigi.pid @@ -56,7 +56,7 @@ Usage: gigi COMMAND [ARGUMENT...] Commands: start - start gigi debug - start gigi in debug mode (on port 8000, with config from stdin) - start-daemon - start gigi in background (using config from /etc/cacert/gig/config.tar) + start-daemon - start gigi in background (using config from /etc/gig/config.tar) signer - start the simple signer signer-conf - extract config for simple signer (and reset-database) from the tar from stdin reset-database - reset the database diff --git a/keys/generateTruststore.sh b/keys/generateTruststore.sh index 0c5aedc2..7b1858a1 100755 --- a/keys/generateTruststore.sh +++ b/keys/generateTruststore.sh @@ -1,14 +1,8 @@ #!/bin/bash -# this script imports the cacert root certs +# this script imports the root certificates for this installation rm -f ../config/cacerts.jks -#wget -N http://www.cacert.org/certs/root.crt -#wget -N http://www.cacert.org/certs/class3.crt - -#keytool -importcert -keystore ../config/cacerts.jks -file root.crt -alias root -storepass "changeit" $1 -#keytool -importcert -keystore ../config/cacerts.jks -file class3.crt -alias class3 -storepass "changeit" $1 - function import(){ keytool -importcert -keystore ../config/cacerts.jks -file "$1.crt" -alias own -storepass "changeit" -alias "$1" $2 } diff --git a/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ b/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ index acbfe323..c24b90f1 100644 --- a/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ +++ b/src/club/wpia/gigi/pages/account/certs/CertificateIssueForm.templ @@ -1,7 +1,7 @@

-

'.?>

+

'.?>

diff --git a/src/club/wpia/gigi/pages/wot/Rules.templ b/src/club/wpia/gigi/pages/wot/Rules.templ index 59c2b77f..e161f174 100644 --- a/src/club/wpia/gigi/pages/wot/Rules.templ +++ b/src/club/wpia/gigi/pages/wot/Rules.templ @@ -1,4 +1,4 @@ -

+

diff --git a/util-testing/club/wpia/gigi/DevelLauncher.java b/util-testing/club/wpia/gigi/DevelLauncher.java index 38580312..306c6474 100644 --- a/util-testing/club/wpia/gigi/DevelLauncher.java +++ b/util-testing/club/wpia/gigi/DevelLauncher.java @@ -94,7 +94,7 @@ public class DevelLauncher { } }.start(); BufferedReader br = new BufferedReader(new InputStreamReader(System.in, "UTF-8")); - System.out.println("Cacert-gigi system sucessfully started."); + System.out.println("Gigi system sucessfully started."); System.out.println("Press enter to shutdown."); br.readLine(); System.exit(0); diff --git a/util/club/wpia/gigi/util/DatabaseManager.java b/util/club/wpia/gigi/util/DatabaseManager.java index 8628103b..54797224 100644 --- a/util/club/wpia/gigi/util/DatabaseManager.java +++ b/util/club/wpia/gigi/util/DatabaseManager.java @@ -36,7 +36,7 @@ public class DatabaseManager { }; } if (args.length < 4) { - System.err.println("Usage: com.mysql.jdbc.Driver jdbc:mysql://localhost/cacert user password"); + System.err.println("Usage: org.postgresql.Driver jdbc:postgresql://localhost/gigi user password"); return; } run(args, test ? ImportType.TEST : ImportType.PRODUCTION); -- 2.39.2