Merge branch 'antifascista' into container-ci

Merge branch 'pem' into 'antifascista'
el .pem estaba de más See merge request sutty/haini.sh!34
2021-11-25 21:47:40 +00:00 · 2021-11-18 15:26:27 +00:00 · 2021-11-18 12:19:44 -03:00 · 2021-10-07 22:35:28 +00:00 · 2021-10-05 21:05:23 -03:00
1 changed files with 4 additions and 2 deletions
--- a/haini.sh
+++ b/haini.sh
@ -116,7 +116,7 @@ generar_certificado() {
    -keyout $domain_key -out $domain_csr \
    -subj '/C=AR/ST=Ninguno/L=Interdimension/O=Sutty-Local/CN=sutty.local'"
  correr "openssl x509 -req -sha256 -days 3650 \
-    -in $domain_csr -CA $ca_crt.pem -CAkey $ca_key \
+    -in $domain_csr -CA $ca_crt -CAkey $ca_key \
    -CAcreateserial -extfile /Sutty/haini.sh/domains.ext -out $domain_crt"

  rm "$ENTORNO$ca_crt.pem"
@ -246,7 +246,9 @@ else
  fi

  crear_entorno
-  stdin=/dev/stdin correr "${*:-$DEFAULT}"
+  stdin=/dev/stdin correr "${*:-$DEFAULT}" ; salida=$?

  ${SSH_ADHOC} && ssh-agent -k
+
+  exit $salida
 fi
Author	SHA1	Message	Date
Nulo	552cb373f1	Merge branch 'antifascista' into container-ci All checks were successful continuous-integration/woodpecker the build was successful Details	2021-11-25 21:47:40 +00:00
Nulo	018a2a443e	Merge branch 'pem' into 'antifascista' el .pem estaba de más See merge request sutty/haini.sh!34	2021-11-18 15:26:27 +00:00
f	6762ee5394	el .pem estaba de más	2021-11-18 12:19:44 -03:00
Nulo	4ea037359b	Merge branch 'exit-0' into 'antifascista' devolver el status de salida de hainish See merge request sutty/haini.sh!31	2021-10-07 22:35:28 +00:00
f	5e52834eae	devolver el status de salida de hainish como el último comando era ssh-agent, salíamos con el status incorrecto	2021-10-05 21:05:23 -03:00