Commit e07459b7 authored by Pietro Saccardi's avatar Pietro Saccardi
Browse files

Using deploy via gitlab ci instead of lektor. 

This is due to issue in difficulties in getting the right parms and keys to lektor
parent 6226a5ee

.gitlab-ci.yml

+7 −5
Original line number Original line Diff line number Diff line
@@ -20,11 +20,13 @@ build:lektor: 
  image: nikolaik/python-nodejs

  image: nikolaik/python-nodejs

  before_script:

  before_script:

    - apt-get update -qq

    - apt-get update -qq

    - apt-get install -qq -yy rsync

    - apt-get install -qq -yy rsync openssh-client

    - mkdir -p ~/.ssh

    - mkdir -p ~/.ssh

    - chmod 700 ~/.ssh

    - chmod 700 ~/.ssh

    - echo "${DEPLOY_KNOWN_HOST}" > ~/.ssh/known_hosts

    - eval $(ssh-agent -s)

    - pipenv install

    - echo "${DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null

    - ssh-keyscan -p ${DEPLOY_PORT} "${DEPLOY_HOST}" >> ~/.ssh/known_hosts

    - chmod 644 ~/.ssh/known_hosts

  only:

  only:

    - master

    - master
@@ -36,7 +38,7 @@ staging:testing: 
    name: staging

    name: staging

    url: https://www.test.mittelab.org

    url: https://www.test.mittelab.org

  script:

  script:

    - pipenv run lektor deploy -O www --key "${DEPLOY_KEY}" testing

    - rsync -avz -e "ssh -p ${DEPLOY_PORT}" www/ "${DEPLOY_USER}@${DEPLOY_HOST}:subdomains/test/"









deploy:production:

deploy:production:
@@ -46,7 +48,7 @@ deploy:production: 
    name: deploy

    name: deploy

    url: https://www.mittelab.org

    url: https://www.mittelab.org

  script:

  script:

    - pipenv run lektor deploy -O www --key "${DEPLOY_KEY}" production

    - rsync -avz -e "ssh -p ${DEPLOY_PORT}" www/ "${DEPLOY_USER}@${DEPLOY_HOST}:www/"

  when: manual

  when: manual

  dependencies:

  dependencies:

    - build:lektor

    - build:lektor

website.lektorproject

+0 −12
Original line number Original line Diff line number Diff line
@@ -17,17 +17,5 @@ name = Slovenian 
url_prefix = /si/

url_prefix = /si/

locale = si_SI

locale = si_SI





[servers.production]

name = Production

enabled = yes

default = no

target = rsync://mittelab@srv01.delex-ws.net:11119/home/mittelab/www/



[servers.testing]

name = Testing

enabled = yes

default = yes

target = rsync://mittelab@srv01.delex-ws.net:11119/home/mittelab/subdomains/test/



[packages]

[packages]

lektor-webpack-support = 0.3
 
lektor-webpack-support = 0.3