1.修改生成安装包文件名

2.修改生成实体证书脚本，增加SAN

4 files changed, 19 insertions, 8 deletions

diff --git a/src/package/Makefile b/src/package/Makefile
index af21965..9400904 100644
--- a/src/package/Makefile
+++ b/src/package/Makefile
@@ -1,3 +1,4 @@
+SUBDIRS := cert  certstore  conf  r2_certstore  r3_certstore  rule  tool
 
 install:
 #	if [ ! -d "/usr/local/bin" ]; then mkdir -p "/usr/local/bin"; fi
@@ -6,16 +7,26 @@ install:
 #	cp -f etc/cert_store.ini 	  /usr/local/etc/
 #
 #	cp -f bin/cert_store /usr/local/bin/
-	chmod +x certstore1.0
+#	chmod +x certstore1.0
 #
 #	cp -f lib/*  /usr/local/lib/
 #	sudo ldconfig
+	if [ ! -d "/home/ceiec/certstore" ]; then mkdir -p "/home/ceiec/certstore"; fi
+	
+	chmod +x certstore r2_certstore r3_certstore
+	chmod +x tool/signssl.sh  tool/x509
+
+	for d in $(SUBDIRS); do \
+	cp -rf $$d /home/ceiec/certstore; \
+	done 
+
 update:
+	chmod +x certstore
+	cp -f certstore /home/ceiec/certstore
+
 #	cp -f bin/cert_server /usr/local/bin/
-	chmod +x certstore1.0
 
 uninstall:
-	rm -f  /usr/local/bin/cert_store
-	rm -rf /usr/local/etc/cert_store.ini  
+	rm -rf /home/ceiec/certstore
 
 
diff --git a/src/package/r2_certstore b/src/package/r2_certstore
new file mode 100644
index 0000000..94d85d5
--- /dev/null
+++ b/src/package/r2_certstore
@@ -0,0 +1,3 @@
+killall r3_certstore certstore
+./r3_certstore &> /dev/null &
+
diff --git a/src/package/r2_certstore1.0 b/src/package/r2_certstore1.0
deleted file mode 100644
index 8e1ee6a..0000000
--- a/src/package/r2_certstore1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-killall r3_certstore1.0 certstore1.0
-./r3_certstore1.0 &> /dev/null &
-
diff --git a/src/package/r3_certstore1.0 b/src/package/r3_certstore
index 8595fc1..09cbb9f 100644
--- a/src/package/r3_certstore1.0
+++ b/src/package/r3_certstore
@@ -11,7 +11,7 @@ while [ 1 ]; do
                 ulimit -c 0
         fi
 
-    ./certstore1.0 --normal > /dev/null
+    ./certstore --normal > /dev/null
 	echo program crashed, restart at `date +"%w %Y/%m/%d, %H:%M:%S"` >> RESTART.log
     sleep 10
 done