CLean unused files + add default squid.conf
This commit is contained in:
parent
c0fe2f11f7
commit
ae13fefdfe
@ -6,22 +6,9 @@ cache:
|
||||
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
|
||||
|
||||
stages:
|
||||
# At first debian : init variables
|
||||
#- build-debian
|
||||
#- create-debian-package
|
||||
#- test-publish-debian
|
||||
- Docker-hub-build
|
||||
- Docker-hub-test
|
||||
- Docker-hub-pushtag
|
||||
|
||||
### All
|
||||
#- build
|
||||
#- create-package
|
||||
#- test-publish
|
||||
|
||||
include:
|
||||
- 'gitlabci/docker-hub.yml'
|
||||
# - 'gitlabci/debianbuster.yml'
|
||||
# - 'gitlabci/ubuntubionic.yml'
|
||||
# - 'gitlabci/raspbianbuster.yml'
|
||||
# - 'gitlabci/ubuntufocal.yml'
|
||||
|
||||
@ -100,7 +100,7 @@ RUN echo "deb-src http://deb.debian.org/debian buster main contrib" >> /etc/apt/
|
||||
&& cp src/squid /usr/sbin/ \
|
||||
&& cp tools/squidclient/squidclient /usr/sbin/ \
|
||||
&& cp src/mime.conf.default /etc/squid/mime.conf \
|
||||
&& cp src/squid.conf /etc/squid/ \
|
||||
&& cp src/squid.conf.default /etc/squid/squid.conf \
|
||||
&& chown -Rf squid /etc/squid \
|
||||
&& chown -Rf squid /usr/lib/squid \
|
||||
&& chown -Rf squid /var/log/squid \
|
||||
|
||||
@ -1,89 +0,0 @@
|
||||
Build debian package:
|
||||
stage: build-debian
|
||||
artifacts:
|
||||
expire_in: 30 minutes
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
image: amd64/debian:stable
|
||||
variables:
|
||||
OS: "debian"
|
||||
script:
|
||||
- apt update
|
||||
- apt-get -y upgrade
|
||||
- apt install --no-install-recommends --no-install-suggests -y curl unzip base-files automake base-passwd
|
||||
bash coreutils dash debianutils diffutils dpkg e2fsprogs findutils grep gzip hostname ncurses-base
|
||||
libevent-pthreads-* libevent-dev ncurses-bin perl-base sed login sysvinit-utils tar bsdutils
|
||||
mount util-linux libc6-dev libc-dev gcc g++ make dpkg-dev autotools-dev debhelper dh-autoreconf dpatch
|
||||
libclamav-dev libpcre3-dev zlib1g-dev pkg-config libssl-dev libssl1.1 git ca-certificates lsb-release
|
||||
- cd $CI_PROJECT_DIR && ./autogen.sh && ./configure '--prefix=/usr' '--enable-clamd=yes' '--with-proxyuser=e2guardian' '--with-proxygroup=e2guardian' '--sysconfdir=/etc' '--localstatedir=/var' '--enable-icap=yes' '--enable-commandline=yes' '--enable-email=yes' '--enable-ntlm=yes' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--enable-pcre=yes' '--enable-sslmitm=yes' 'CPPFLAGS=-mno-sse2 -g -O2'
|
||||
- make
|
||||
- find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" +
|
||||
|
||||
Create Debian Package:
|
||||
stage: create-debian-package
|
||||
image: amd64/debian:stable
|
||||
artifacts:
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
variables:
|
||||
PACKPATH: "$CI_PROJECT_DIR"
|
||||
PACKDST: "$CI_PROJECT_DIR/scripts/debian_package/e2debian_package"
|
||||
OS: "debian"
|
||||
script:
|
||||
- apt update && apt install --no-install-recommends --no-install-suggests -y curl git ca-certificates util-linux binutils
|
||||
- git clone https://github.com/fredbcode/scripts
|
||||
- cp ${PACKPATH}/src/e2guardian ${PACKDST}/data/usr/sbin/e2guardian
|
||||
- chmod +x ${PACKDST}/data/usr/sbin/e2guardian
|
||||
- cp -Rf ${PACKPATH}/configs ${PACKDST}/data/etc/e2guardian
|
||||
- mkdir -p ${PACKPATH}/share/e2guardian/languages
|
||||
- cp -Rf ${PACKPATH}/data/languages ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/*.gif ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/*swf ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/scripts/e2guardian.service ${PACKDST}/data/lib/systemd/system
|
||||
- find ${PACKDST}/ -type f -name "Makefil*" -delete
|
||||
- find ${PACKDST}/ -type f -name "*.in" -delete
|
||||
- SIZE=`stat -c %s ${PACKDST}/data` && echo $SIZE && sed -i "s/Installed-Size:.*$/Installed-Size:\ $SIZE/g" ${PACKDST}/control/control
|
||||
- VFULL=`${PACKDST}/data/usr/sbin/e2guardian -v | sed -n 1p | cut -d ' ' -f 2` && sed -i "s/Version:.*$/Version:\ $VFULL/g" ${PACKDST}/control/control
|
||||
- echo "export VFULL=$VFULL" >> $CI_PROJECT_DIR/scripts/debian_package/variables
|
||||
- cd ${PACKDST} && cd .. && ./rebuild.sh e2"$OS"_package
|
||||
- find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" +
|
||||
|
||||
Test and publish Debian:
|
||||
stage: test-publish-debian
|
||||
image: amd64/debian:stable
|
||||
artifacts:
|
||||
name: builddebian
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
variables:
|
||||
PACKPATH: "$CI_PROJECT_DIR"
|
||||
PACKDST: "$CI_PROJECT_DIR/scripts/debian_package"
|
||||
CERT_DIR: "/etc/e2guardian/private/"
|
||||
OS: "debian"
|
||||
script:
|
||||
- source $CI_PROJECT_DIR/scripts/debian_package/variables
|
||||
- echo $VFULL
|
||||
- apt update
|
||||
- apt install -y openssl curl git lsb-release libevent-pthreads* libtommath*
|
||||
- VERSION=`lsb_release -cs`
|
||||
- cd ${PACKDST} && dpkg -i e2"$OS"_package.deb
|
||||
- sed -i "s/^#sslmitm.*$/sslmitm\ =\ on/" /etc/e2guardian/e2guardianf1.conf && sed -i "s/^#enablessl.*$/enablessl\ =\ on/" /etc/e2guardian/e2guardian.conf && sed -i "s/^RANDFILE\s*=\s*\\\$ENV/#RANDFILE\ =\ \$ENV/" /etc/ssl/openssl.cnf
|
||||
- mkdir -p ${CERT_DIR}generatedcerts
|
||||
- openssl genrsa 4096 > "${CERT_DIR}ca.key" && openssl req -subj "/C=US" -new -x509 -days 3650 -key "${CERT_DIR}ca.key" -out "${CERT_DIR}ca.pem" && openssl genrsa 4096 > "${CERT_DIR}cert.key"
|
||||
- chown --recursive e2guardian:e2guardian ${CERT_DIR}
|
||||
- echo "qwant.com" >> /etc/e2guardian/lists/example.group/bannedsitelist
|
||||
- e2guardian -N &
|
||||
- sleep 5 && export https_proxy=http://localhost:8080
|
||||
- curl -k -o /tmp/test https://www.google.com
|
||||
- curl -k https://www.qwant.com | grep -i e2guardian
|
||||
- unset https_proxy
|
||||
- mkdir -p "${CI_COMMIT_BRANCH}"
|
||||
- mv e2"$OS"_package.deb ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d).deb
|
||||
- md5sum ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d).deb > ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d)_md5.txt
|
||||
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
|
||||
- mkdir -p ~/.ssh
|
||||
- eval $(ssh-agent -s)
|
||||
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
||||
- ssh-add <(echo "$SSH_NOSTROMO_KEY")
|
||||
- scp -P 822 -r ${CI_COMMIT_BRANCH} e2git@e2guardian.numsys.eu:/datas/e2/html
|
||||
- find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" +
|
||||
@ -1,67 +0,0 @@
|
||||
build:raspbian:
|
||||
stage: build
|
||||
image: amd64/debian:stable
|
||||
artifacts:
|
||||
expire_in: 30 minutes
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
variables:
|
||||
OS: "raspbian"
|
||||
script:
|
||||
- source $CI_PROJECT_DIR/scripts/debian_package/variables
|
||||
- echo $VFULL
|
||||
- apt update
|
||||
- apt-get -y upgrade
|
||||
- apt install --no-install-recommends --no-install-suggests -y curl unzip base-files automake base-passwd pkg-config bash coreutils debianutils diffutils dpkg e2fsprogs findutils grep gzip hostname ncurses-base tar git bsdutils lsb-release
|
||||
- echo "deb-src http://deb.debian.org/debian buster main contrib non-free" >> /etc/apt/sources.list
|
||||
- dpkg --add-architecture armhf
|
||||
- apt-get update
|
||||
- apt-get install -y build-essential crossbuild-essential-armhf
|
||||
- apt-get build-dep -y -a armhf e2guardian
|
||||
- cd $CI_PROJECT_DIR && make clean
|
||||
- ./autogen.sh
|
||||
- ./configure --host=arm-linux-gnueabihf --prefix=/usr --enable-clamd=yes --with-proxyuser=e2guardian --with-proxygroup=e2guardian --sysconfdir=/etc --localstatedir=/var --enable-icap=yes --enable-commandline=yes --enable-email=yes --enable-ntlm=yes --enable-pcre=yes --enable-sslmitm=yes
|
||||
- make ARCH=arm-linux-gnueabihf
|
||||
- file src/e2guardian | grep "ARM, EABI5"
|
||||
- find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" +
|
||||
|
||||
package:raspbian:
|
||||
stage: create-package
|
||||
image: amd64/debian:stable
|
||||
dependencies:
|
||||
- build:raspbian
|
||||
artifacts:
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
variables:
|
||||
PACKPATH: "$CI_PROJECT_DIR"
|
||||
PACKDST: "$CI_PROJECT_DIR/scripts/debian_package/e2raspbian_package"
|
||||
OS: "raspbian"
|
||||
script:
|
||||
- source $CI_PROJECT_DIR/scripts/debian_package/variables
|
||||
- apt update
|
||||
- apt install -y curl git lsb-release binutils
|
||||
- echo $VFULL
|
||||
- VERSION=`lsb_release -cs`
|
||||
- SIZE=`stat -c %s ${PACKDST}/data` && echo $SIZE && sed -i "s/Installed-Size:.*$/Installed-Size:\ $SIZE/g" ${PACKDST}/control/control
|
||||
- sed -i "s/Version:.*$/Version:\ $VFULL/g" ${PACKDST}/control/control
|
||||
- cp ${PACKPATH}/src/e2guardian ${PACKDST}/data/usr/sbin/e2guardian
|
||||
- chmod +x ${PACKDST}/data/usr/sbin/e2guardian
|
||||
- cp -Rf ${PACKPATH}/configs ${PACKDST}/data/etc/e2guardian
|
||||
- mkdir -p ${PACKPATH}/share/e2guardian/languages
|
||||
- cp -Rf ${PACKPATH}/data/languages ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/*.gif ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/*swf ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/scripts/e2guardian.service ${PACKDST}/data/lib/systemd/system
|
||||
- find ${PACKDST}/ -type f -name "Makefil*" -delete
|
||||
- find ${PACKDST}/ -type f -name "*.in" -delete
|
||||
- cd ${PACKDST} && cd .. && ./rebuild.sh e2"$OS"_package
|
||||
- mv e2"$OS"_package.deb ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d).deb
|
||||
- md5sum ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d).deb > ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d)_md5.txt
|
||||
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
|
||||
- mkdir -p ~/.ssh
|
||||
- eval $(ssh-agent -s)
|
||||
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
||||
- ssh-add <(echo "$SSH_NOSTROMO_KEY")
|
||||
- scp -P 822 -r ${CI_COMMIT_BRANCH} e2git@e2guardian.numsys.eu:/datas/e2/html
|
||||
- find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" +
|
||||
@ -1,94 +0,0 @@
|
||||
build:bionic:
|
||||
stage: build
|
||||
image: amd64/ubuntu:18.04
|
||||
artifacts:
|
||||
expire_in: 30 minutes
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
script:
|
||||
- source $CI_PROJECT_DIR/scripts/debian_package/variables
|
||||
- echo $VFULL
|
||||
- apt update
|
||||
- apt-get -y upgrade
|
||||
- apt install --no-install-recommends --no-install-suggests -y curl unzip base-files automake base-passwd
|
||||
bash coreutils dash debianutils diffutils dpkg e2fsprogs findutils grep gzip hostname ncurses-base
|
||||
libevent-pthreads-* libevent-dev ncurses-bin perl-base sed login sysvinit-utils tar bsdutils
|
||||
mount util-linux libc6-dev libc-dev gcc g++ make dpkg-dev autotools-dev debhelper dh-autoreconf dpatch
|
||||
libclamav-dev libpcre3-dev zlib1g-dev pkg-config libssl-dev libssl1.1 git ca-certificates lsb-release
|
||||
- cd $CI_PROJECT_DIR && make clean && ./autogen.sh && ./configure '--prefix=/usr' '--enable-clamd=yes' '--with-proxyuser=e2guardian' '--with-proxygroup=e2guardian' '--sysconfdir=/etc' '--localstatedir=/var' '--enable-icap=yes' '--enable-commandline=yes' '--enable-email=yes' '--enable-ntlm=yes' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--enable-pcre=yes' '--enable-sslmitm=yes' 'CPPFLAGS=-mno-sse2 -g -O2'
|
||||
- make
|
||||
- find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" +
|
||||
|
||||
package:bionic:
|
||||
stage: create-package
|
||||
image: amd64/ubuntu:18.04
|
||||
dependencies:
|
||||
- build:bionic
|
||||
artifacts:
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
variables:
|
||||
PACKPATH: "$CI_PROJECT_DIR"
|
||||
PACKDST: "$CI_PROJECT_DIR/scripts/debian_package/e2ubuntu_package"
|
||||
OS: "ubuntu"
|
||||
script:
|
||||
- source $CI_PROJECT_DIR/scripts/debian_package/variables
|
||||
- echo $VFULL
|
||||
- apt update && apt install --no-install-recommends --no-install-suggests -y curl git ca-certificates util-linux binutils
|
||||
- SIZE=`stat -c %s ${PACKDST}/data` && echo $SIZE && sed -i "s/Installed-Size:.*$/Installed-Size:\ $SIZE/g" ${PACKDST}/control/control
|
||||
- cp ${PACKPATH}/src/e2guardian ${PACKDST}/data/usr/sbin/e2guardian
|
||||
- chmod +x ${PACKDST}/data/usr/sbin/e2guardian
|
||||
- cp -Rf ${PACKPATH}/configs ${PACKDST}/data/etc/e2guardian
|
||||
- mkdir -p ${PACKPATH}/share/e2guardian/languages
|
||||
- cp -Rf ${PACKPATH}/data/languages ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/*.gif ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/*swf ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/scripts/e2guardian.service ${PACKDST}/data/lib/systemd/system
|
||||
- find ${PACKDST}/ -type f -name "Makefil*" -delete
|
||||
- find ${PACKDST}/ -type f -name "*.in" -delete
|
||||
- sed -i "s/Version:.*$/Version:\ $VFULL/g" ${PACKDST}/control/control
|
||||
- cd ${PACKDST} && cd .. && ./rebuild.sh e2"$OS"_package
|
||||
- rm -rf .git
|
||||
- find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" +
|
||||
|
||||
test:bionic:
|
||||
stage: test-publish
|
||||
image: amd64/ubuntu:18.04
|
||||
dependencies:
|
||||
- package:bionic
|
||||
artifacts:
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
variables:
|
||||
PACKPATH: "$CI_PROJECT_DIR"
|
||||
PACKDST: "$CI_PROJECT_DIR/scripts/debian_package/e2ubuntu_package"
|
||||
CERT_DIR: "/etc/e2guardian/private/"
|
||||
OS: "ubuntu"
|
||||
script:
|
||||
- source $CI_PROJECT_DIR/scripts/debian_package/variables
|
||||
- echo $VFULL
|
||||
- apt update
|
||||
- apt install -y curl openssl git lsb-release libevent-pthreads* libtommath*
|
||||
- VERSION=`lsb_release -cs`
|
||||
- cd ${PACKDST} && cd .. && dpkg -i e2"$OS"_package.deb
|
||||
- sed -i "s/^#sslmitm.*$/sslmitm\ =\ on/" /etc/e2guardian/e2guardianf1.conf && sed -i "s/^#enablessl.*$/enablessl\ =\ on/" /etc/e2guardian/e2guardian.conf && sed -i "s/^RANDFILE\s*=\s*\\\$ENV/#RANDFILE\ =\ \$ENV/" /etc/ssl/openssl.cnf
|
||||
- mkdir -p ${CERT_DIR}generatedcerts
|
||||
- openssl genrsa 4096 > "${CERT_DIR}ca.key" && openssl req -subj "/C=US" -new -x509 -days 3650 -key "${CERT_DIR}ca.key" -out "${CERT_DIR}ca.pem" && openssl genrsa 4096 > "${CERT_DIR}cert.key"
|
||||
- chown --recursive e2guardian:e2guardian ${CERT_DIR}
|
||||
- echo "qwant.com" >> /etc/e2guardian/lists/example.group/bannedsitelist
|
||||
- e2guardian -N &
|
||||
- sleep 5 && export https_proxy=http://localhost:8080
|
||||
- curl -k -o /tmp/test https://www.google.com
|
||||
- curl -k https://www.qwant.com | grep -i e2guardian
|
||||
- unset https_proxy
|
||||
- mkdir -p "${CI_COMMIT_BRANCH}"
|
||||
- mv e2"$OS"_package.deb ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d).deb
|
||||
- md5sum ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d).deb > ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d)_md5.txt
|
||||
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
|
||||
- mkdir -p ~/.ssh
|
||||
- eval $(ssh-agent -s)
|
||||
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
||||
- ssh-add <(echo "$SSH_NOSTROMO_KEY")
|
||||
- scp -P 822 -r ${CI_COMMIT_BRANCH} e2git@e2guardian.numsys.eu:/datas/e2/html
|
||||
- find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" +
|
||||
|
||||
@ -1,94 +0,0 @@
|
||||
build:focal:
|
||||
stage: build
|
||||
image: amd64/ubuntu:20.04
|
||||
artifacts:
|
||||
expire_in: 30 minutes
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
script:
|
||||
- source $CI_PROJECT_DIR/scripts/debian_package/variables
|
||||
- echo $VFULL
|
||||
- apt update
|
||||
- apt-get -y upgrade
|
||||
- export DEBIAN_FRONTEND="noninteractive" && apt install --no-install-recommends --no-install-suggests -y curl unzip base-files automake base-passwd
|
||||
bash coreutils dash debianutils diffutils dpkg e2fsprogs findutils grep gzip hostname ncurses-base
|
||||
libevent-pthreads-2.1-7 libevent-dev ncurses-bin perl-base sed login sysvinit-utils tar bsdutils
|
||||
mount util-linux libc6-dev libc-dev gcc g++ make dpkg-dev autotools-dev debhelper dh-autoreconf dpatch
|
||||
libclamav-dev libpcre3-dev zlib1g-dev pkg-config libssl-dev libssl1.1 git ca-certificates lsb-release
|
||||
- cd $CI_PROJECT_DIR && make clean && ./autogen.sh && ./configure '--prefix=/usr' '--enable-clamd=yes' '--with-proxyuser=e2guardian' '--with-proxygroup=e2guardian' '--sysconfdir=/etc' '--localstatedir=/var' '--enable-icap=yes' '--enable-commandline=yes' '--enable-email=yes' '--enable-ntlm=yes' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' '--enable-pcre=yes' '--enable-sslmitm=yes' 'CPPFLAGS=-mno-sse2 -g -O2'
|
||||
- make
|
||||
- find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" +
|
||||
|
||||
package:focal:
|
||||
stage: create-package
|
||||
image: amd64/ubuntu:20.04
|
||||
dependencies:
|
||||
- build:focal
|
||||
artifacts:
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
variables:
|
||||
PACKPATH: "$CI_PROJECT_DIR"
|
||||
PACKDST: "$CI_PROJECT_DIR/scripts/debian_package/e2ubuntu_package"
|
||||
OS: "ubuntu"
|
||||
script:
|
||||
- source $CI_PROJECT_DIR/scripts/debian_package/variables
|
||||
- echo $VFULL
|
||||
- apt update && apt install --no-install-recommends --no-install-suggests -y curl git ca-certificates util-linux binutils
|
||||
- SIZE=`stat -c %s ${PACKDST}/data` && echo $SIZE && sed -i "s/Installed-Size:.*$/Installed-Size:\ $SIZE/g" ${PACKDST}/control/control
|
||||
- sed -i "s/libevent-pthreads-2.1-6/libevent-pthreads-2.1-7/g" ${PACKDST}/control/control
|
||||
- cp ${PACKPATH}/src/e2guardian ${PACKDST}/data/usr/sbin/e2guardian
|
||||
- chmod +x ${PACKDST}/data/usr/sbin/e2guardian
|
||||
- cp -Rf ${PACKPATH}/configs ${PACKDST}/data/etc/e2guardian
|
||||
- mkdir -p ${PACKPATH}/share/e2guardian/languages
|
||||
- cp -Rf ${PACKPATH}/data/languages ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/*.gif ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/*swf ${PACKDST}/data/usr/share/e2guardian/
|
||||
- cp ${PACKPATH}/data/scripts/e2guardian.service ${PACKDST}/data/lib/systemd/system
|
||||
- find ${PACKDST}/ -type f -name "Makefil*" -delete
|
||||
- find ${PACKDST}/ -type f -name "*.in" -delete
|
||||
- sed -i "s/Version:.*$/Version:\ $VFULL/g" ${PACKDST}/control/control
|
||||
- cd ${PACKDST} && cd .. && ./rebuild.sh e2"$OS"_package
|
||||
- rm -rf .git
|
||||
- find /builds/ -name ".git" -exec rm -r "{}" +
|
||||
|
||||
test:focal:
|
||||
stage: test-publish
|
||||
image: amd64/ubuntu:20.04
|
||||
dependencies:
|
||||
- package:focal
|
||||
artifacts:
|
||||
paths:
|
||||
- $CI_PROJECT_DIR
|
||||
variables:
|
||||
PACKPATH: "$CI_PROJECT_DIR"
|
||||
PACKDST: "$CI_PROJECT_DIR/scripts/debian_package/e2ubuntu_package"
|
||||
CERT_DIR: "/etc/e2guardian/private/"
|
||||
OS: "ubuntu"
|
||||
script:
|
||||
- source $CI_PROJECT_DIR/scripts/debian_package/variables
|
||||
- echo $VFULL
|
||||
- apt update
|
||||
- apt install -y curl openssl git lsb-release libevent-pthreads-2.1-7 libtommath1
|
||||
- VERSION=`lsb_release -cs`
|
||||
- cd ${PACKDST} && cd .. && dpkg -i e2"$OS"_package.deb
|
||||
- sed -i "s/^#sslmitm.*$/sslmitm\ =\ on/" /etc/e2guardian/e2guardianf1.conf && sed -i "s/^#enablessl.*$/enablessl\ =\ on/" /etc/e2guardian/e2guardian.conf && sed -i "s/^RANDFILE\s*=\s*\\\$ENV/#RANDFILE\ =\ \$ENV/" /etc/ssl/openssl.cnf
|
||||
- mkdir -p ${CERT_DIR}generatedcerts
|
||||
- openssl genrsa 4096 > "${CERT_DIR}ca.key" && openssl req -subj "/C=US" -new -x509 -days 3650 -key "${CERT_DIR}ca.key" -out "${CERT_DIR}ca.pem" && openssl genrsa 4096 > "${CERT_DIR}cert.key"
|
||||
- chown --recursive e2guardian:e2guardian ${CERT_DIR}
|
||||
- echo "qwant.com" >> /etc/e2guardian/lists/example.group/bannedsitelist
|
||||
- e2guardian -N &
|
||||
- sleep 5 && export https_proxy=http://localhost:8080
|
||||
- curl -k -o /tmp/test https://www.google.com
|
||||
- curl -k https://www.qwant.com | grep -i e2guardian
|
||||
- unset https_proxy
|
||||
- mkdir -p "${CI_COMMIT_BRANCH}"
|
||||
- mv e2"$OS"_package.deb ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d).deb
|
||||
- md5sum ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d).deb > ${CI_COMMIT_BRANCH}/e2"$OS"_"$VERSION"_V"$VFULL"_$(date +%Y%m%d)_md5.txt
|
||||
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
|
||||
- mkdir -p ~/.ssh
|
||||
- eval $(ssh-agent -s)
|
||||
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
||||
- ssh-add <(echo "$SSH_NOSTROMO_KEY")
|
||||
- scp -P 822 -r ${CI_COMMIT_BRANCH} e2git@e2guardian.numsys.eu:/datas/e2/html
|
||||
- find $CI_PROJECT_DIR -name ".git" -exec rm -r "{}" +
|
||||
Loading…
x
Reference in New Issue
Block a user