Pārlūkot izejas kodu

Изменил переменные. Поправил ошибки

OBT-SYSADM\tomishinets 6 gadi atpakaļ
vecāks
revīzija
9090d269c6
1 mainītis faili ar 13 papildinājumiem un 13 dzēšanām
  1. 13 13
      generate.sh

+ 13 - 13
generate.sh

@@ -2,7 +2,7 @@
 
 git_dir="pki"
 branch="100883"
-git_url="https://git.sdsys.ru/sdsys/pki.git"
+#git_url="git.sdsys.ru/sdsys/pki.git"
 
 function mail_send {
               echo "${message}"|mail -s "Attention! Certificate status!" \
@@ -16,28 +16,28 @@ function mail_send {
               -S from=${JENKINS_MAIL_USER} \
               ${RECIPIENT_MAIL_BOX}
 }
-if [ -z "$*" ]; then message="No domain specified!!!"; mail_send; exit 1;fi
+if [ -z "$*" ]; then message="letsencrypt. No domain specified!!!"; mail_send; exit 1;fi
 
 if [ -d /${git_dir} ]
 then
-  cd /${git_dir} && git pull https://${GIT_USER}:$(cat /run/provision-pass)@${git_url} && git checkout ${branch}
-  if [ $? -ne 0 ];then message="Can't pull ${git_url}"; mail_send; exit 1;fi
+  cd /${git_dir} && git pull https://${GIT_USER}:$(cat /run/secrets/provision-pass)@${GIT_URL} && git checkout ${branch}
+  if [ $? -ne 0 ];then message="letsencrypt. Can't pull https://${GIT_URL}"; mail_send; exit 1;fi
 else
-  cd / && git clone https://${GIT_USER}:$(cat /run/secrets/provision-pass)@${git_url} && cd /${git_dir} && git checkout ${branch}
-  if [ $? -ne 0 ];then message="Can't clone ${git_url}"; mail_send; exit 1;fi
+  cd / && git clone https://${GIT_USER}:$(cat /run/secrets/provision-pass)@${GIT_URL} && cd /${git_dir} && git checkout ${branch}
+  if [ $? -ne 0 ];then message="letsencrypt. Can't clone https://${GIT_URL}"; mail_send; exit 1;fi
 fi
 
 domain=$(echo "$*" | sed 's/ / -d /g')
 certbot certonly --dry-run --webroot -w /var/www/html --config-dir /${git_dir}/letsencrypt -m admin@sdsys.ru -d ${domain}
-if [ $? -ne 0 ];then message="Can't execute "dry-run" for $(echo $*). Generate cert and key will be skipped!!!"; mail_send; exit 1;fi
+if [ $? -ne 0 ];then message="letsencrypt. Can't execute "dry-run" for $(echo $*). Generate cert and key will be skipped!!!"; mail_send; exit 1;fi
 
-certbot certonly --webroot -w /var/www/html --config-dir /${git_dir}/letsencrypt -m admin@sdsys.ru -d ${domain}
-if [ $? -ne 0 ];then message="Can't generate cert and key for $(echo $*). See log !!!"; mail_send; exit 1;fi
+#certbot certonly --webroot -w /var/www/html --config-dir /${git_dir}/letsencrypt -m admin@sdsys.ru -d ${domain}
+#if [ $? -ne 0 ];then message="letsencrypt. Can't generate cert and key for $(echo $*). See log !!!"; mail_send; exit 1;fi
 
 echo "Generate new key and cert for $(echo $*)" > /tmp/commit.txt
-cd /${git_dir} && git add -A && git config --global user.email "${JENKINS_MAIL}" && git config --global user.name "Jenkins" && git commit -F /tmp/commit.txt
-git push https://${GIT_USER}:$(cat /run/secrets/provision-pass)@${git_url} ${branch}
-if [ $? -ne 0 ];then message="Can't push diff to ${git_url} !!!"; mail_send; exit 1;fi
+cd /${git_dir} && git add -A && git config --global user.email "${JENKINS_MAIL_USER}" && git config --global user.name "Jenkins" && git commit -F /tmp/commit.txt
+git push https://${GIT_USER}:$(cat /run/secrets/provision-pass)@${GIT_URL} ${branch}
+if [ $? -ne 0 ];then message="letsencrypt. Can't push diff to https://${GIT_URL} !!!"; mail_send; exit 1;fi
 
-message="Certs for domain $(echo $*) is generated!!!"
+message="letsencrypt. Certs for domain $(echo $*) is generated!!!"
 mail_send