Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms

This commit is contained in:
sanghee 2020-01-19 23:51:21 +01:00
commit 9e318df545
3 changed files with 49 additions and 6 deletions

39
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,39 @@
stages:
- build
- deploy
image: debian:latest
variables:
BUILDDIR: "build/"
build:
stage: build
before_script:
- apt-get update
- apt-get install -y make lektor imagemagick
script:
- make build
artifacts:
expire_in: 12 hours
paths:
- "build/"
deploy:
stage: deploy
only:
- master
environment:
name: production
url: https://ungleich.ch/
before_script:
# Install dependencies
- apt-get update
- apt-get install -y make openssh-client rsync
# Configure the SSH Agent
- eval $(ssh-agent -s)
- echo "$CD_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- mkdir -p ~/.ssh
- echo "$CD_SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
script:
- make deploy

View File

@ -1,4 +1,4 @@
BUILDDIR=../ungleich-staticcms-build
BUILDDIR?=../ungleich-staticcms-build
DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/
all: publish
@ -6,9 +6,12 @@ all: publish
pull:
git pull
publish: pull build permissions
publish: pull build deploy
deploy: permissions
rsync -av --delete --exclude .lektor/ $(BUILDDIR)/u/ $(DESTINATION)
rsync -av --delete $(BUILDDIR)/sitemap.xml $(DESTINATION)
permissions: build
find $(BUILDDIR) -type f -exec chmod 0644 {} \;
find $(BUILDDIR) -type d -exec chmod 0755 {} \;

View File

@ -80,7 +80,7 @@ content2_image: /u/image/zerocarbon-no.jpg
offer1_title: 100 GB @ 23CHF/month
---
offer1_text:
* Free IPv6 VPN for increased security
* **One free IPv6 VPN** included for increased security
* Datacenter location: Glarus, Switzerland
* Enhanced security by limiting access to only your devices
@ -92,9 +92,10 @@ offer1_link: https://ungleich.ch
offer2_title: 1 TB @ 36.5CHF/month
---
offer2_text:
* Free IPv6 VPN for increased security
* **Two free IPv6 VPNs** included for increased security
* Datacenter location: Glarus, Switzerland
* Enhanced security by limiting access to only your devices
* Enhanced security by limiting access
Free IPv6 VPNto only your devices
Recommended for small to medium organisations
@ -104,7 +105,7 @@ offer2_link: https://ungleich.ch
offer3_title: 50 TB @ 540 CHF/month
---
offer3_text:
* Free IPv6 VPN for increased security
* **Ten free IPv6 VPNs** included for increased security
* Datacenter location: Glarus, Switzerland
* Enhanced security by limiting access to only your devices
* **30% large scale discount**