ソースを参照

Add check for email Ubuntu 18.04 + Hide warning

Jaap Marcus 4 年 前
コミット
27bab9eede
1 ファイル変更5 行追加1 行削除
  1. 5 1
      bin/v-generate-ssl-cert

+ 5 - 1
bin/v-generate-ssl-cert

@@ -74,6 +74,10 @@ args_usage='DOMAIN EMAIL COUNTRY STATE CITY ORG UNIT [ALIASES] [FORMAT]'
 check_args '7' "$#" "$args_usage"
 check_args '7' "$#" "$args_usage"
 is_format_valid 'domain' 'aliases' 'format'
 is_format_valid 'domain' 'aliases' 'format'
 
 
+release="$(lsb_release -s -r)"
+if [ "$release" = "18.04" ]; then
+    is_format_valid 'email'
+fi
 
 
 if [ ! -f /root/.rnd ]; then
 if [ ! -f /root/.rnd ]; then
     touch /root/.rnd
     touch /root/.rnd
@@ -108,7 +112,7 @@ if [ -z "$aliases" ]; then
         -batch \
         -batch \
         -subj "$subj" \
         -subj "$subj" \
         -key $domain.key \
         -key $domain.key \
-        -out $domain.csr #>/dev/null 2>&1
+        -out $domain.csr >/dev/null 2>&1
 else
 else
     for alias in $(echo $domain,$aliases |tr ',' '\n' |sort -u); do
     for alias in $(echo $domain,$aliases |tr ',' '\n' |sort -u); do
         if [[ "$alias" = *[![:ascii:]]* ]]; then
         if [[ "$alias" = *[![:ascii:]]* ]]; then