Bob Mottram 9 лет назад
Родитель
Сommit
85b60e0af4
1 измененных файлов: 9 добавлений и 7 удалений
  1. 9
    7
      src/freedombone-addcert

+ 9
- 7
src/freedombone-addcert Просмотреть файл

@@ -40,7 +40,7 @@ NODH=
40 40
 function show_help {
41 41
     echo ''
42 42
     echo 'freedombone-addcert -h [hostname] -c [country code] -a [area] -l [location]'
43
-    echo '                    -o [organisation] -u [unit]'
43
+    echo '                    -o [organisation] -u [unit] --ca "" --nodh ""'
44 44
     echo ''
45 45
     echo 'Creates a self-signed certificate for the given hostname'
46 46
     echo ''
@@ -51,8 +51,8 @@ function show_help {
51 51
     echo '  -l --location [locn]       Optional location name'
52 52
     echo '  -o --organisation [name]   Optional organisation name'
53 53
     echo '  -u --unit [name]           Optional unit name'
54
-    echo '     --nodh                  Do not calculate DH params'
55
-    echo '     --ca                    Certificate authority cert'
54
+    echo '     --nodh ""               Do not calculate DH params'
55
+    echo '     --ca ""                 Certificate authority cert'
56 56
     echo ''
57 57
     exit 0
58 58
 }
@@ -90,10 +90,12 @@ case $key in
90 90
     UNIT="$1"
91 91
     ;;
92 92
     --ca)
93
+    shift
93 94
     EXTENSIONS="-extensions v3_ca"
94 95
     ORGANISATION="Freedombone-CA"
95 96
     ;;
96 97
     --nodh)
98
+    shift
97 99
     NODH="true"
98 100
     ;;
99 101
     *)
@@ -115,13 +117,13 @@ fi
115 117
 
116 118
 CERTFILE=$HOSTNAME
117 119
 if [[ $ORGANISATION == "Freedombone-CA" ]]; then
118
-	CERTFILE="ca-$HOSTNAME"
120
+    CERTFILE="ca-$HOSTNAME"
119 121
 fi
120 122
 
121 123
 openssl req -x509 $EXTENSIONS -nodes -days 3650 -sha256 \
122
-		-subj "/O=$ORGANISATION/OU=$UNIT/C=$COUNTRY_CODE/ST=$AREA/L=$LOCATION/CN=$HOSTNAME" \
123
-		-newkey rsa:4096 -keyout /etc/ssl/private/$CERTFILE.key \
124
-		-out /etc/ssl/certs/$CERTFILE.crt
124
+        -subj "/O=$ORGANISATION/OU=$UNIT/C=$COUNTRY_CODE/ST=$AREA/L=$LOCATION/CN=$HOSTNAME" \
125
+        -newkey rsa:4096 -keyout /etc/ssl/private/$CERTFILE.key \
126
+        -out /etc/ssl/certs/$CERTFILE.crt
125 127
 if [ ! $NODH ]; then
126 128
     openssl dhparam -check -text -5 1024 -out /etc/ssl/certs/$CERTFILE.dhparam
127 129
 fi