Skip to content

Commit

Permalink
Update to dehydrated 0.7.1 to fix LE staging CA and various improveme…
Browse files Browse the repository at this point in the history
…nts (#64)

Reviewed by: Brianna Bennett
  • Loading branch information
teutat3s committed Aug 2, 2024
1 parent 9c5b034 commit efe5b39
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 39 deletions.
11 changes: 3 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# file, You can obtain one at https://mozilla.org/MPL/2.0/.

# Copyright 2021 Joyent, Inc.
# Copyright 2024 MNX Cloud, Inc.

SCRIPT= deps/dehydrated/dehydrated
ARCHIVE= dehydrated.tar.gz
Expand All @@ -11,7 +12,7 @@ VERSION= $(shell git tag --sort=taggerdate | tail -1)
# Prevent macOS from putting resource forks in the tar
export COPYFILE_DISABLE=true

.PHONY: archive patch release subclean
.PHONY: archive release subclean
archive: $(ARCHIVE)

release: clean .version $(ARCHIVE)
Expand All @@ -21,10 +22,9 @@ release: clean .version $(ARCHIVE)
echo "$(VERSION)" > $@
git rev-parse HEAD 2>/dev/null >> $@

$(ARCHIVE): clean $(SCRIPT) patch .version
$(ARCHIVE): clean $(SCRIPT) .version
find . -type f \
-not -path '*/.git/*' \
-not -path '*/PATCHES/*' \
-not -name '.git*' \
-not -name '.travis.yml' \
-not -name 'Makefile' \
Expand All @@ -34,11 +34,6 @@ $(ARCHIVE): clean $(SCRIPT) patch .version
$(SCRIPT):
git submodule init && git submodule update

# This is a temporary hack to work around an upstream bug. We want a better
# way to handle this.
patch: $(SCRIPT)
patch -p1 $< < PATCHES/000-fix-grep.patch

subclean:
git submodule foreach --recursive git reset --hard

Expand Down
28 changes: 0 additions & 28 deletions PATCHES/000-fix-grep.patch

This file was deleted.

4 changes: 2 additions & 2 deletions cns-hook-util
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# file, You can obtain one at https://mozilla.org/MPL/2.0/.

# Copyright 2021 Joyent, Inc.
# Copyright 2023 MNX Cloud, Inc.
# Copyright 2024 MNX Cloud, Inc.

function getservice {
local vmuuid
Expand Down Expand Up @@ -248,7 +248,7 @@ function clean_challenge {
vmadm update "$vmuuid"
;;
*)
# We should never hit this becuase it would have been filtered out
# We should never hit this because it would have been filtered out
# much earlier.
echo "ERROR: Unknown service: $vmservice"
;;
Expand Down
2 changes: 1 addition & 1 deletion deps/dehydrated

0 comments on commit efe5b39

Please sign in to comment.