diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa240eb2cb922a2e1ea43be3c12b82e2248fe500..8caa19101eb8227a743d5905343981f324fd7993 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ image: containers.ethitter.com:443/docker/images/debian:stretch before_script: - apt-get update - apt-get -y --no-install-recommends install devscripts lintian fakeroot - - mkdir ../nginx-package-build.orig + - mkdir nginx-package-build.orig - echo $CI_BUILDS_DIR - echo $CI_PROJECT_DIR @@ -16,6 +16,7 @@ after_script: package: stage: build script: + - cd source - debuild -us -uc # artifacts: # paths: diff --git a/Makefile b/Makefile deleted file mode 100644 index 50e39ef596b033629a8faac301176279c8ff0801..0000000000000000000000000000000000000000 --- a/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Relies on latest binary build artifact from https://git.ethitter.com/debian/nginx-build. -get_binary: - curl -o sources/usr/sbin/nginx "$NGINX_BINARY" - -install: get_binary - install sources/etc/default/nginx /etc/default/nginx - install sources/etc/init.d/nginx /etc/init.d/nginx - install sources/etc/logrotate.d/nginx /etc/logrotate.d/nginx - install sources/etc/nginx/ /etc/nginx/ - install sources/usr/lib/nginx/modules/ /usr/lib/nginx/modules/ - install -m 0755 sources/usr/sbin/nginx /usr/sbin/nginx - install sources/usr/share/doc/nginx/ /usr/share/doc/nginx/ - install sources/usr/share/nginx/ /usr/share/nginx/ - install sources/var/cache/nginx/ /var/cache/nginx/ - install sources/var/log/nginx/ /var/log/nginx/ diff --git a/source/Makefile b/source/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..b8a979ded9332161ff9172cad25883407877796c --- /dev/null +++ b/source/Makefile @@ -0,0 +1,15 @@ +# Relies on latest binary build artifact from https://git.ethitter.com/debian/nginx-build. +get_binary: + curl -o fakeroot/usr/sbin/nginx "$NGINX_BINARY" + +install: get_binary + install fakeroot/etc/default/nginx /etc/default/nginx + install fakeroot/etc/init.d/nginx /etc/init.d/nginx + install fakeroot/etc/logrotate.d/nginx /etc/logrotate.d/nginx + install fakeroot/etc/nginx/ /etc/nginx/ + install fakeroot/usr/lib/nginx/modules/ /usr/lib/nginx/modules/ + install -m 0755 fakeroot/usr/sbin/nginx /usr/sbin/nginx + install fakeroot/usr/share/doc/nginx/ /usr/share/doc/nginx/ + install fakeroot/usr/share/nginx/ /usr/share/nginx/ + install fakeroot/var/cache/nginx/ /var/cache/nginx/ + install fakeroot/var/log/nginx/ /var/log/nginx/ diff --git a/debian/changelog b/source/debian/changelog similarity index 100% rename from debian/changelog rename to source/debian/changelog diff --git a/debian/compat b/source/debian/compat similarity index 100% rename from debian/compat rename to source/debian/compat diff --git a/debian/control b/source/debian/control similarity index 100% rename from debian/control rename to source/debian/control diff --git a/debian/copyright b/source/debian/copyright similarity index 100% rename from debian/copyright rename to source/debian/copyright diff --git a/debian/rules b/source/debian/rules similarity index 100% rename from debian/rules rename to source/debian/rules diff --git a/sources/etc/default/nginx b/source/fakeroot/etc/default/nginx similarity index 100% rename from sources/etc/default/nginx rename to source/fakeroot/etc/default/nginx diff --git a/sources/etc/init.d/nginx b/source/fakeroot/etc/init.d/nginx similarity index 100% rename from sources/etc/init.d/nginx rename to source/fakeroot/etc/init.d/nginx diff --git a/sources/etc/logrotate.d/nginx b/source/fakeroot/etc/logrotate.d/nginx similarity index 100% rename from sources/etc/logrotate.d/nginx rename to source/fakeroot/etc/logrotate.d/nginx diff --git a/sources/etc/nginx/conf.d/default.conf b/source/fakeroot/etc/nginx/conf.d/default.conf similarity index 100% rename from sources/etc/nginx/conf.d/default.conf rename to source/fakeroot/etc/nginx/conf.d/default.conf diff --git a/sources/etc/nginx/fastcgi_params b/source/fakeroot/etc/nginx/fastcgi_params similarity index 100% rename from sources/etc/nginx/fastcgi_params rename to source/fakeroot/etc/nginx/fastcgi_params diff --git a/sources/etc/nginx/koi-utf b/source/fakeroot/etc/nginx/koi-utf similarity index 100% rename from sources/etc/nginx/koi-utf rename to source/fakeroot/etc/nginx/koi-utf diff --git a/sources/etc/nginx/koi-win b/source/fakeroot/etc/nginx/koi-win similarity index 100% rename from sources/etc/nginx/koi-win rename to source/fakeroot/etc/nginx/koi-win diff --git a/sources/etc/nginx/mime.types b/source/fakeroot/etc/nginx/mime.types similarity index 100% rename from sources/etc/nginx/mime.types rename to source/fakeroot/etc/nginx/mime.types diff --git a/sources/etc/nginx/modules/.gitkeep b/source/fakeroot/etc/nginx/modules/.gitkeep similarity index 100% rename from sources/etc/nginx/modules/.gitkeep rename to source/fakeroot/etc/nginx/modules/.gitkeep diff --git a/sources/etc/nginx/nginx.conf b/source/fakeroot/etc/nginx/nginx.conf similarity index 100% rename from sources/etc/nginx/nginx.conf rename to source/fakeroot/etc/nginx/nginx.conf diff --git a/sources/etc/nginx/scgi_params b/source/fakeroot/etc/nginx/scgi_params similarity index 100% rename from sources/etc/nginx/scgi_params rename to source/fakeroot/etc/nginx/scgi_params diff --git a/sources/etc/nginx/uwsgi_params b/source/fakeroot/etc/nginx/uwsgi_params similarity index 100% rename from sources/etc/nginx/uwsgi_params rename to source/fakeroot/etc/nginx/uwsgi_params diff --git a/sources/etc/nginx/win-utf b/source/fakeroot/etc/nginx/win-utf similarity index 100% rename from sources/etc/nginx/win-utf rename to source/fakeroot/etc/nginx/win-utf diff --git a/sources/usr/lib/nginx/modules/.gitkeep b/source/fakeroot/usr/lib/nginx/modules/.gitkeep similarity index 100% rename from sources/usr/lib/nginx/modules/.gitkeep rename to source/fakeroot/usr/lib/nginx/modules/.gitkeep diff --git a/sources/usr/sbin/.gitkeep b/source/fakeroot/usr/sbin/.gitkeep similarity index 100% rename from sources/usr/sbin/.gitkeep rename to source/fakeroot/usr/sbin/.gitkeep diff --git a/sources/usr/share/doc/nginx/README b/source/fakeroot/usr/share/doc/nginx/README similarity index 100% rename from sources/usr/share/doc/nginx/README rename to source/fakeroot/usr/share/doc/nginx/README diff --git a/sources/usr/share/doc/nginx/copyright b/source/fakeroot/usr/share/doc/nginx/copyright similarity index 100% rename from sources/usr/share/doc/nginx/copyright rename to source/fakeroot/usr/share/doc/nginx/copyright diff --git a/sources/usr/share/nginx/html/50x.html b/source/fakeroot/usr/share/nginx/html/50x.html similarity index 100% rename from sources/usr/share/nginx/html/50x.html rename to source/fakeroot/usr/share/nginx/html/50x.html diff --git a/sources/usr/share/nginx/html/index.html b/source/fakeroot/usr/share/nginx/html/index.html similarity index 100% rename from sources/usr/share/nginx/html/index.html rename to source/fakeroot/usr/share/nginx/html/index.html diff --git a/sources/var/cache/nginx/.gitkeep b/source/fakeroot/var/cache/nginx/.gitkeep similarity index 100% rename from sources/var/cache/nginx/.gitkeep rename to source/fakeroot/var/cache/nginx/.gitkeep diff --git a/sources/var/log/nginx/.gitkeep b/source/fakeroot/var/log/nginx/.gitkeep similarity index 100% rename from sources/var/log/nginx/.gitkeep rename to source/fakeroot/var/log/nginx/.gitkeep