Skip to content

Commit e74a891

Browse files
dodinhdodinh
committed
Copy mime-types.conf from older lighttpd package (missing in > 3.21)
1 parent b48705f commit e74a891

File tree

4 files changed

+121
-27
lines changed

4 files changed

+121
-27
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## xxxx-xx-xx - dev
44

5-
...
5+
* [Deployment] Fix lighttpd mime-types
66

77
## 2026-01-21 - 0.2.5
88

‎Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN apk add --update --no-cache lighttpd \
1212
&& chgrp lighttpd /usr/sbin/lighttpd
1313

1414
COPY --chown=:lighttpd ./docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
15+
COPY --chown=:lighttpd ./docker/mime-types.conf /etc/lighttpd/mime-types.conf
1516

1617
WORKDIR /var/www/html
1718
COPY --chown=:lighttpd ./releases/${DCATAPPLU_VERSION}/codelists ./resource

‎docker/mime-types.conf‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
###############################################################################
2+
# Default mime-types.conf for Gentoo.
3+
# include'd from lighttpd.conf.
4+
# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mime-types.conf,v 1.4 2010/03/14 21:45:18 bangert Exp $
5+
###############################################################################
6+
7+
# {{{ mime types
8+
mimetype.assign = (
9+
".svg" => "image/svg+xml",
10+
".svgz" => "image/svg+xml",
11+
".pdf" => "application/pdf",
12+
".sig" => "application/pgp-signature",
13+
".spl" => "application/futuresplash",
14+
".class" => "application/octet-stream",
15+
".ps" => "application/postscript",
16+
".torrent" => "application/x-bittorrent",
17+
".dvi" => "application/x-dvi",
18+
".gz" => "application/x-gzip",
19+
".pac" => "application/x-ns-proxy-autoconfig",
20+
".swf" => "application/x-shockwave-flash",
21+
".tar.gz" => "application/x-tgz",
22+
".tgz" => "application/x-tgz",
23+
".tar" => "application/x-tar",
24+
".zip" => "application/zip",
25+
".dmg" => "application/x-apple-diskimage",
26+
".mp3" => "audio/mpeg",
27+
".m3u" => "audio/x-mpegurl",
28+
".wma" => "audio/x-ms-wma",
29+
".wax" => "audio/x-ms-wax",
30+
".ogg" => "application/ogg",
31+
".wav" => "audio/x-wav",
32+
".gif" => "image/gif",
33+
".jpg" => "image/jpeg",
34+
".jpeg" => "image/jpeg",
35+
".png" => "image/png",
36+
".xbm" => "image/x-xbitmap",
37+
".xpm" => "image/x-xpixmap",
38+
".xwd" => "image/x-xwindowdump",
39+
".css" => "text/css",
40+
".html" => "text/html",
41+
".htm" => "text/html",
42+
".js" => "text/javascript",
43+
".asc" => "text/plain",
44+
".c" => "text/plain",
45+
".h" => "text/plain",
46+
".cc" => "text/plain",
47+
".cpp" => "text/plain",
48+
".hh" => "text/plain",
49+
".hpp" => "text/plain",
50+
".conf" => "text/plain",
51+
".log" => "text/plain",
52+
".text" => "text/plain",
53+
".txt" => "text/plain",
54+
".diff" => "text/plain",
55+
".patch" => "text/plain",
56+
".ebuild" => "text/plain",
57+
".eclass" => "text/plain",
58+
".rtf" => "application/rtf",
59+
".bmp" => "image/bmp",
60+
".tif" => "image/tiff",
61+
".tiff" => "image/tiff",
62+
".ico" => "image/x-icon",
63+
".dtd" => "text/xml",
64+
".xml" => "text/xml",
65+
".mpeg" => "video/mpeg",
66+
".mpg" => "video/mpeg",
67+
".mov" => "video/quicktime",
68+
".qt" => "video/quicktime",
69+
".avi" => "video/x-msvideo",
70+
".asf" => "video/x-ms-asf",
71+
".asx" => "video/x-ms-asf",
72+
".wmv" => "video/x-ms-wmv",
73+
".bz2" => "application/x-bzip",
74+
".tbz" => "application/x-bzip-compressed-tar",
75+
".tar.bz2" => "application/x-bzip-compressed-tar"
76+
)
77+
# }}}
78+
79+
# vim: set ft=conf foldmethod=marker et :

‎drafts/0.0.1-draft-0.1/release.sh‎

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,31 @@ else
5050
exit 1
5151
fi
5252

53+
# check if ado remote is configured
54+
echo -n "Checking if ado connection is configured... "
55+
if git ls-remote --exit-code ado > /dev/null 2>&1; then
56+
echo "ok"
57+
else
58+
echo -e "fail\n"
59+
echo "TODO: Add git remote \"ado\" pointing to the Azure DevOps repository."
60+
echo "Aborting release"
61+
exit 1
62+
fi
63+
64+
# check if a merge will be conflict-free
65+
echo -n "Checking if merge with main is conflict-free... "
66+
git fetch ado main > /dev/null 2>&1
67+
if git merge-tree --write-tree ado/main develop > /dev/null 2>&1; then
68+
echo "ok"
69+
else
70+
echo -e "fail\n"
71+
echo "TODO: Manually merge ado/main into develop."
72+
echo "Aborting release"
73+
exit 1
74+
fi
75+
76+
echo -en "\nRunning pre-release tests..."
77+
5378
# validate all PLU examples using the `SHACL` shapefile
5479
echo -e "Validating PLU examples..."
5580
for file in "$(dirname "$0")/examples"/*; do
@@ -79,31 +104,21 @@ else
79104
exit 1
80105
fi
81106

82-
# check if a merge will be conflict-free
83-
echo -n "Checking if merge with main is conflict-free... "
84-
git fetch ado main > /dev/null 2>&1
85-
if git merge-tree --write-tree ado/main develop > /dev/null 2>&1; then
86-
echo "ok"
87-
else
88-
echo -e "fail\n"
89-
echo "TODO: Manually merge ado/main into develop."
90-
echo "Aborting release"
91-
exit 1
92-
fi
107+
# latest version
108+
LATEST_VERSION=$(git show ado/main:CHANGELOG.md | grep -m 1 -E "^## [0-9]{4}-[0-9]{2}-[0-9]{2} - " | sed 's@.* - @@')
109+
echo -e "\nLatest released version is ${LATEST_VERSION}"
93110

94111
# choose new version type
95-
echo -en "\nWhich version do you want to release [major, minor, bugfix]? "
112+
echo -en "\nWhich version do you want to release [major, minor, patch]? "
96113
read VERSION_TYPE
97-
if [ "${VERSION_TYPE}" != "major" ] && [ "${VERSION_TYPE}" != "minor" ] && [ "${VERSION_TYPE}" != "bugfix" ]; then
98-
echo "Version has to be one of [major, minor, bugfix], aborting..."
114+
if [ "${VERSION_TYPE}" != "major" ] && [ "${VERSION_TYPE}" != "minor" ] && [ "${VERSION_TYPE}" != "patch" ]; then
115+
echo "Version has to be one of [major, minor, patch], aborting..."
99116
exit 1
100117
fi
101118

102119
# build new version number
103-
git fetch --prune --tags
104120
DRAFT_VERSION="../drafts/0.0.1-draft-0.1"
105121
ESC_DRAFT_VERSION="\.\./drafts/0\.0\.1-draft-0\.1"
106-
LATEST_VERSION=$(git describe --abbrev=0 --tags main)
107122
VERSION_ARRAY=( ${LATEST_VERSION//./ } )
108123
ESC_LATEST_VERSION="${VERSION_ARRAY[0]}\.${VERSION_ARRAY[1]}\.${VERSION_ARRAY[2]}"
109124
case ${VERSION_TYPE} in
@@ -116,31 +131,31 @@ case ${VERSION_TYPE} in
116131
((VERSION_ARRAY[1]++))
117132
VERSION_ARRAY[2]=0
118133
;;
119-
"bugfix")
134+
"patch")
120135
((VERSION_ARRAY[2]++))
121136
;;
122137
esac
123138
NEXT_VERSION="${VERSION_ARRAY[0]}.${VERSION_ARRAY[1]}.${VERSION_ARRAY[2]}"
124139

125-
echo -e "\nCurrent version is ${LATEST_VERSION}"
126-
echo -e "Preparing to release new ${VERSION_TYPE} version ${NEXT_VERSION}"
127-
echo -en "\nContinue [y/n]? "
140+
echo -en "Preparing to release new ${VERSION_TYPE} version ${NEXT_VERSION}, continue [Y/n]? "
128141
read CONTINUE_RELEASE
129-
if [ "${CONTINUE_RELEASE}" != "y" ]; then
142+
if [[ "${CONTINUE_RELEASE}" != "y" && "${CONTINUE_RELEASE}" != "Y" && "${CONTINUE_RELEASE}" != "" ]]; then
130143
echo "You cancelled the release process, aborting..."
131144
exit 1
132145
fi
133146

134147
# go to project root
135148
pushd "$(dirname "$0")/../../" > /dev/null || exit 1
136149

137-
# set the new version in changelog (first check if it is up-to-date)
150+
# check if changelog format is consistent and set the new version in changelog
138151
if ! grep -Fq "## xxxx-xx-xx - dev" CHANGELOG.md; then
139152
echo "The changelog must contain the line \"## xxxx-xx-xx - dev\", aborting..."
140153
exit 1
141154
fi
142-
sed -i "s@## xxxx-xx-xx - dev@## $(date --iso-8601) - ${NEXT_VERSION}@g" CHANGELOG.md
143155

156+
# prepare release
157+
echo -e "\nUpdating changelog..."
158+
sed -i "s@## xxxx-xx-xx - dev@## $(date --iso-8601) - ${NEXT_VERSION}@g" CHANGELOG.md
144159
# create a new folder in releases, named after the new version number (semver)
145160
mkdir -p releases/${NEXT_VERSION}/examples
146161

@@ -174,6 +189,8 @@ sed -i "s@ENV DCATAPPLU_VERSION=${ESC_DRAFT_VERSION}@ENV DCATAPPLU_VERSION=${NEX
174189
echo
175190
git add .
176191
git commit -m "Prepare for ${NEXT_VERSION} release"
192+
193+
# merge, tag new release
177194
git checkout main
178195
git merge --no-ff -m "Release ${NEXT_VERSION}" develop
179196
git tag -a ${NEXT_VERSION} -m "Release ${NEXT_VERSION}"
@@ -189,6 +206,3 @@ git add Dockerfile
189206
git commit -m "Set next development version"
190207

191208
echo -e "\nThe new ${VERSION_TYPE} release ${NEXT_VERSION} has been created locally."
192-
echo "Next steps:"
193-
echo "- Push the local release to github: git push --follow-tags origin main develop"
194-
echo "- Announce new version via mail and ADO"

0 commit comments

Comments
 (0)