Skip to content

Commit 6b0fb69

Browse files
phedoreanuphedoreanu
authored
Merge branch 'acmesh-official:master' into bugfix/1984_hosting_csrftoken
2 parents cfdbd1f + c8f48a4 commit 6b0fb69

File tree

16 files changed

+754
-233
lines changed

16 files changed

+754
-233
lines changed

‎.github/workflows/DNS.yml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -121,19 +121,19 @@ jobs:
121121
- name: Run acmetest
122122
run: |
123123
if [ "${{ secrets.TokenName1}}" ] ; then
124-
export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
124+
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
125125
fi
126126
if [ "${{ secrets.TokenName2}}" ] ; then
127-
export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
127+
export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
128128
fi
129129
if [ "${{ secrets.TokenName3}}" ] ; then
130-
export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
130+
export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
131131
fi
132132
if [ "${{ secrets.TokenName4}}" ] ; then
133-
export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
133+
export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
134134
fi
135135
if [ "${{ secrets.TokenName5}}" ] ; then
136-
export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
136+
export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
137137
fi
138138
cd ../acmetest
139139
./letest.sh
@@ -184,19 +184,19 @@ jobs:
184184
shell: bash
185185
run: |
186186
if [ "${{ secrets.TokenName1}}" ] ; then
187-
export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
187+
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
188188
fi
189189
if [ "${{ secrets.TokenName2}}" ] ; then
190-
export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
190+
export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
191191
fi
192192
if [ "${{ secrets.TokenName3}}" ] ; then
193-
export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
193+
export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
194194
fi
195195
if [ "${{ secrets.TokenName4}}" ] ; then
196-
export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
196+
export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
197197
fi
198198
if [ "${{ secrets.TokenName5}}" ] ; then
199-
export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
199+
export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
200200
fi
201201
cd ../acmetest
202202
./letest.sh
@@ -234,19 +234,19 @@ jobs:
234234
copyback: false
235235
run: |
236236
if [ "${{ secrets.TokenName1}}" ] ; then
237-
export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
237+
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
238238
fi
239239
if [ "${{ secrets.TokenName2}}" ] ; then
240-
export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
240+
export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
241241
fi
242242
if [ "${{ secrets.TokenName3}}" ] ; then
243-
export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
243+
export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
244244
fi
245245
if [ "${{ secrets.TokenName4}}" ] ; then
246-
export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
246+
export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
247247
fi
248248
if [ "${{ secrets.TokenName5}}" ] ; then
249-
export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
249+
export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
250250
fi
251251
cd ../acmetest
252252
./letest.sh
@@ -285,19 +285,19 @@ jobs:
285285
copyback: false
286286
run: |
287287
if [ "${{ secrets.TokenName1}}" ] ; then
288-
export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
288+
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
289289
fi
290290
if [ "${{ secrets.TokenName2}}" ] ; then
291-
export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
291+
export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
292292
fi
293293
if [ "${{ secrets.TokenName3}}" ] ; then
294-
export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
294+
export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
295295
fi
296296
if [ "${{ secrets.TokenName4}}" ] ; then
297-
export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
297+
export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
298298
fi
299299
if [ "${{ secrets.TokenName5}}" ] ; then
300-
export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
300+
export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
301301
fi
302302
cd ../acmetest
303303
./letest.sh
@@ -337,19 +337,19 @@ jobs:
337337
copyback: false
338338
run: |
339339
if [ "${{ secrets.TokenName1}}" ] ; then
340-
export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
340+
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
341341
fi
342342
if [ "${{ secrets.TokenName2}}" ] ; then
343-
export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
343+
export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
344344
fi
345345
if [ "${{ secrets.TokenName3}}" ] ; then
346-
export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
346+
export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
347347
fi
348348
if [ "${{ secrets.TokenName4}}" ] ; then
349-
export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
349+
export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
350350
fi
351351
if [ "${{ secrets.TokenName5}}" ] ; then
352-
export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
352+
export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
353353
fi
354354
cd ../acmetest
355355
./letest.sh
@@ -389,19 +389,19 @@ jobs:
389389
copyback: false
390390
run: |
391391
if [ "${{ secrets.TokenName1}}" ] ; then
392-
export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
392+
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
393393
fi
394394
if [ "${{ secrets.TokenName2}}" ] ; then
395-
export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
395+
export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
396396
fi
397397
if [ "${{ secrets.TokenName3}}" ] ; then
398-
export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
398+
export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
399399
fi
400400
if [ "${{ secrets.TokenName4}}" ] ; then
401-
export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
401+
export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
402402
fi
403403
if [ "${{ secrets.TokenName5}}" ] ; then
404-
export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
404+
export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
405405
fi
406406
cd ../acmetest
407407
./letest.sh
@@ -445,19 +445,19 @@ jobs:
445445
pkg set-mediator -v -I [email protected] openssl
446446
export PATH=/usr/gnu/bin:$PATH
447447
if [ "${{ secrets.TokenName1}}" ] ; then
448-
export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
448+
export ${{ secrets.TokenName1}}="${{ secrets.TokenValue1}}"
449449
fi
450450
if [ "${{ secrets.TokenName2}}" ] ; then
451-
export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
451+
export ${{ secrets.TokenName2}}="${{ secrets.TokenValue2}}"
452452
fi
453453
if [ "${{ secrets.TokenName3}}" ] ; then
454-
export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
454+
export ${{ secrets.TokenName3}}="${{ secrets.TokenValue3}}"
455455
fi
456456
if [ "${{ secrets.TokenName4}}" ] ; then
457-
export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
457+
export ${{ secrets.TokenName4}}="${{ secrets.TokenValue4}}"
458458
fi
459459
if [ "${{ secrets.TokenName5}}" ] ; then
460-
export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
460+
export ${{ secrets.TokenName5}}="${{ secrets.TokenValue5}}"
461461
fi
462462
cd ../acmetest
463463
./letest.sh

‎.github/workflows/NetBSD.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161
nat: |
6262
"8080": "80"
6363
prepare: |
64-
export PKG_PATH="https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/$(uname -r|cut -f '1 2' -d.)/All/"
6564
pkg_add curl socat
6665
usesh: true
6766
copyback: false

‎.github/workflows/Ubuntu.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,14 @@ jobs:
8080
-p 9000:9000 \
8181
-e "DOCKER_STEPCA_INIT_NAME=Smallstep" \
8282
-e "DOCKER_STEPCA_INIT_DNS_NAMES=localhost,$(hostname -f)" \
83+
-e "DOCKER_STEPCA_INIT_REMOTE_MANAGEMENT=true" \
84+
-e "DOCKER_STEPCA_INIT_PASSWORD=test" \
8385
--name stepca \
84-
smallstep/step-ca \
85-
&& sleep 5 && docker exec stepca step ca provisioner add acme --type ACME \
86+
smallstep/step-ca:0.23.1
87+
88+
sleep 5
89+
docker exec stepca bash -c "echo test >test" \
90+
&& docker exec stepca step ca provisioner add acme --type ACME --admin-subject step --admin-password-file=/home/step/test \
8691
&& docker exec stepca kill -1 1 \
8792
&& docker exec stepca cat /home/step/certs/root_ca.crt | sudo bash -c "cat - >>/etc/ssl/certs/ca-certificates.crt"
8893
- name: Clone acmetest

‎.github/workflows/dockerhub.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
id: step_one
2929
run: |
3030
if [ "$DOCKER_PASSWORD" ] ; then
31-
echo "::set-output name=hasToken::true"
31+
echo "hasToken=true" >>$GITHUB_OUTPUT
3232
else
33-
echo "::set-output name=hasToken::false"
33+
echo "hasToken=false" >>$GITHUB_OUTPUT
3434
fi
3535
- name: Check the value
3636
run: echo ${{ steps.step_one.outputs.hasToken }}

‎Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.16.3
1+
FROM alpine:3.17
22

33
RUN apk --no-cache add -f \
44
openssl \
@@ -12,7 +12,8 @@ RUN apk --no-cache add -f \
1212
oath-toolkit-oathtool \
1313
tar \
1414
libidn \
15-
jq
15+
jq \
16+
cronie
1617

1718
ENV LE_CONFIG_HOME /acme.sh
1819

@@ -25,7 +26,7 @@ COPY ./ /install_acme.sh/
2526
RUN cd /install_acme.sh && ([ -f /install_acme.sh/acme.sh ] && /install_acme.sh/acme.sh --install || curl https://get.acme.sh | sh) && rm -rf /install_acme.sh/
2627

2728

28-
RUN ln -s /root/.acme.sh/acme.sh /usr/local/bin/acme.sh && crontab -l | grep acme.sh | sed 's#> /dev/null##' | crontab -
29+
RUN ln -s /root/.acme.sh/acme.sh /usr/local/bin/acme.sh && crontab -l | grep acme.sh | sed 's#> /dev/null#> /proc/1/fd/1 2>/proc/1/fd/2#' | crontab -
2930

3031
RUN for verb in help \
3132
version \
@@ -64,12 +65,10 @@ RUN for verb in help \
6465

6566
RUN printf "%b" '#!'"/usr/bin/env sh\n \
6667
if [ \"\$1\" = \"daemon\" ]; then \n \
67-
trap \"echo stop && killall crond && exit 0\" SIGTERM SIGINT \n \
68-
crond && sleep infinity &\n \
69-
wait \n \
68+
exec crond -n -s -m off \n \
7069
else \n \
7170
exec -- \"\$@\"\n \
72-
fi" >/entry.sh && chmod +x /entry.sh
71+
fi\n" >/entry.sh && chmod +x /entry.sh
7372

7473
VOLUME /acme.sh
7574

‎README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,6 @@ Ok, it's done.
361361

362362
# 10. Issue ECC certificates
363363

364-
`Let's Encrypt` can now issue **ECDSA** certificates.
365-
366-
And we support them too!
367-
368364
Just set the `keylength` parameter with a prefix `ec-`.
369365

370366
For example:
@@ -385,10 +381,12 @@ Please look at the `keylength` parameter above.
385381

386382
Valid values are:
387383

388-
1. **ec-256 (prime256v1, "ECDSA P-256")**
384+
1. **ec-256 (prime256v1, "ECDSA P-256", which is the default key type)**
389385
2. **ec-384 (secp384r1, "ECDSA P-384")**
390386
3. **ec-521 (secp521r1, "ECDSA P-521", which is not supported by Let's Encrypt yet.)**
391-
387+
4. **2048 (RSA2048)**
388+
5. **3072 (RSA3072)**
389+
6. **4096 (RSA4096)**
392390

393391

394392
# 11. Issue Wildcard certificates

0 commit comments

Comments
 (0)