diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb82a2561fa5bf00618aa6e2896801ff07850231..f26d5191136f9073d4b1629447805a34c0079f02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,18 +1,9 @@ -# TODO: replace with container that provides all build deps. image: containers.ethitter.com:443/docker/images/debian:stretch before_script: - - apt-get update - - apt-get -y --no-install-recommends install devscripts lintian fakeroot - - echo $NGINX_VERSION - - echo $NGINX_BINARY # Relies on latest binary build artifact from https://git.ethitter.com/debian/nginx-build. - curl -o nginx-build "${NGINX_BINARY}" -after_script: - - ls -la $CI_BUILDS_DIR - - ls -la $CI_PROJECT_DIR - package: stage: build script: @@ -20,4 +11,5 @@ package: - debuild -us -uc artifacts: paths: - - nginx* + - nginx_${NGINX_VERSION}* + - nginx-dbgsym_${NGINX_VERSION}* diff --git a/source/debian/rules b/source/debian/rules index 2948d350c19248a2bff4d4d21ed64b221a8a4dc8..5e4f9a06d73987a5c7b9a604acc62463bb85b381 100755 --- a/source/debian/rules +++ b/source/debian/rules @@ -7,13 +7,24 @@ export DESTROOT=$(CURDIR)/debian/nginx override_dh_auto_install: dh_auto_install + install -D -p -m 0755 ../nginx-build $(DESTROOT)/usr/sbin/nginx install -D -p etc/default/nginx $(DESTROOT)/etc/default/nginx install -D -p etc/init.d/nginx $(DESTROOT)/etc/init.d/nginx install -D -p etc/logrotate.d/nginx $(DESTROOT)/etc/logrotate.d/nginx - install -d -p etc/nginx/ $(DESTROOT)/etc/nginx/ + install -D -p etc/nginx/fastcgi_params $(DESTROOT)/etc/nginx/fastcgi_params + install -D -p etc/nginx/koi-utf $(DESTROOT)/etc/nginx/koi-utf + install -D -p etc/nginx/koi-win $(DESTROOT)/etc/nginx/koi-win + install -D -p etc/nginx/mime.types $(DESTROOT)/etc/nginx/mime.types + install -D -p etc/nginx/nginx.conf $(DESTROOT)/etc/nginx/nginx.conf + install -D -p etc/nginx/scgi_params $(DESTROOT)/etc/nginx/scgi_params + install -D -p etc/nginx/uwsgi_params $(DESTROOT)/etc/nginx/uwsgi_params + install -D -p etc/nginx/wint-utf $(DESTROOT)/etc/nginx/win-utf + install -D -p etc/nginx/conf.d/default.conf $(DESTROOT)/etc/nginx/conf.d/default.conf + install -d -p etc/nginx/modules $(DESTROOT)/etc/nginx/modules install -d -p usr/lib/nginx/modules/ $(DESTROOT)/usr/lib/nginx/modules/ - install -D -p -m 0755 ../nginx-build $(DESTROOT)/usr/sbin/nginx - install -d -p usr/share/doc/nginx/ $(DESTROOT)/usr/share/doc/nginx/ - install -d -p usr/share/nginx/ $(DESTROOT)/usr/share/nginx/ + install -D -p usr/share/doc/nginx/copyright $(DESTROOT)/usr/share/doc/nginx/copyright + install -D -p usr/share/doc/nginx/README $(DESTROOT)/usr/share/doc/nginx/README + install -D -p usr/share/nginx/html/50x.html $(DESTROOT)/usr/share/nginx/html/50x.html + install -D -p usr/share/nginx/html/index.html $(DESTROOT)/usr/share/nginx/html/index.html install -d -p var/cache/nginx/ $(DESTROOT)/var/cache/nginx/ install -d -p var/log/nginx/ $(DESTROOT)/var/log/nginx/ diff --git a/source/usr/share/doc/nginx/copyright b/source/usr/share/doc/nginx/copyright index 47dd9e1a7ddf01b739f53d61e9eb121982baabf5..05be3c4724261ca6a6e7624e1a59bec6faf74de2 100644 --- a/source/usr/share/doc/nginx/copyright +++ b/source/usr/share/doc/nginx/copyright @@ -1,6 +1,6 @@ This work was packaged by: - Erick Hitter <erick@ethitter.com> on Tue, 24 Jan 2017 09:00:00 -0800 + Erick Hitter <nginx-build@mxh.ethitter.com> on Tue, 24 Jan 2017 09:00:00 -0800 It was downloaded from: