summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CommModule/.gitignore19
-rwxr-xr-xCommModule/commmodule6
l---------CommModule/commmodule-signer1
-rwxr-xr-xCommModule/logclean.sh4
-rwxr-xr-xCommModule/server.pl4
5 files changed, 27 insertions, 7 deletions
diff --git a/CommModule/.gitignore b/CommModule/.gitignore
new file mode 100644
index 0000000..40a9309
--- /dev/null
+++ b/CommModule/.gitignore
@@ -0,0 +1,19 @@
+# Ignore autogenerated serial conf file
+/serial.conf
+/serialserver.conf
+
+# Ignore *-active files
+/client.pl-active
+/server.pl-active
+
+# Ignore log files
+/logfile20??-??-??.txt
+/nohup.out
+/oldlogs/
+
+# Ignore working files generated by the signer
+/currentcrls/
+/delta?.diff
+/revoke-root?.crl
+/timesync.sh
+/work/
diff --git a/CommModule/commmodule b/CommModule/commmodule
index f003f30..ad8b5e7 100755
--- a/CommModule/commmodule
+++ b/CommModule/commmodule
@@ -21,7 +21,7 @@
# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="CAcert CommModule processes start/stop"
-NAME=commmodule
+NAME=commmodule-signer
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
@@ -154,8 +154,8 @@ case "$1" in
chown root.root /etc/init.d/${NAME}
update-rc.d -f ${NAME} remove
update-rc.d ${NAME} defaults 90 20
- (echo "COMMROOT=/home/cacert/www/CommModule";
- echo "COMMROLE=client") >/etc/default/${NAME}
+ (echo "COMMROOT=/home/signer/cacert-devel/CommModule";
+ echo "COMMROLE=server") >/etc/default/${NAME}
;;
*)
echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|setup}" >&2
diff --git a/CommModule/commmodule-signer b/CommModule/commmodule-signer
new file mode 120000
index 0000000..cba17f5
--- /dev/null
+++ b/CommModule/commmodule-signer
@@ -0,0 +1 @@
+commmodule \ No newline at end of file
diff --git a/CommModule/logclean.sh b/CommModule/logclean.sh
index 99963ee..b99b7d6 100755
--- a/CommModule/logclean.sh
+++ b/CommModule/logclean.sh
@@ -13,9 +13,9 @@ syslog_notice()
}
# determine location of CommModule
-if [ -d /home/cacert/www/CommModule ]
+if [ -d /home/signer/cacert-devel/CommModule ]
then # webdb server
- cd /home/cacert/www/CommModule
+ cd /home/signer/cacert-devel/CommModule
elif [ -d /root/CommModule ]
then # signing server
cd /root/CommModule
diff --git a/CommModule/server.pl b/CommModule/server.pl
index 6084042..6640552 100755
--- a/CommModule/server.pl
+++ b/CommModule/server.pl
@@ -21,8 +21,8 @@ my $debug=0;
my $paranoid=1;
-my $serialport="/dev/ttyUSB0";
-#my $serialport="/dev/ttyS0";
+#my $serialport="/dev/ttyUSB0";
+my $serialport="/dev/ttyS0";
my $CPSUrl="http://www.cacert.org/cps.php";