~hokiegeek/hokiegeek.netOLD

2a596b148ace22fd5a4e6b2498e92a5504ee5570 — HokieGeek 8 months ago 77c6b98 2.10.1
Tweak to directory name I did not like
3 files changed, 5 insertions(+), 5 deletions(-)

M .build.yml
M .gitlab-ci.yml
M package.json
M .build.yml => .build.yml +1 -1
@@ 46,5 46,5 @@ tasks:
      docker push $IMAGE_TAG
      docker push $IMAGE_LATEST_TAG
  - deploy: |
      cd ${PROJ}/prod-conf
      cd ${PROJ}/prod
      ansible-playbook -i ${DEPLOY_HOST}, -u ${DEPLOY_USER} -e image=${CI_REGISTRY}/hokiegeek/${PROJ}:latest ./ansible.yml

M .gitlab-ci.yml => .gitlab-ci.yml +3 -3
@@ 104,7 104,7 @@ deploy-and-restart:
    - apk update && apk upgrade
    - apk add --no-cache ansible
  script:
    - cd ./prod-conf
    - cd ./prod
    - ansible-playbook -i ${DEPLOY_HOST}, -u ${ADMIN_USER} -e image=${CI_REGISTRY}/hokiegeek/${PROJ}:latest ./ansible.yml

.server-connector-template: &server-connector-template


@@ 119,7 119,7 @@ deploy-and-restart:
  <<: *server-connector-template
  stage: deploy
  script:
    - scp -i /tmp/sshkey -o StrictHostKeyChecking=no ./prod-conf/proxy-home.conf $ADMIN_USER@${DEPLOY_HOST}:/tmp
    - scp -i /tmp/sshkey -o StrictHostKeyChecking=no ./prod/proxy-home.conf $ADMIN_USER@${DEPLOY_HOST}:/tmp
    - ssh -i /tmp/sshkey -o StrictHostKeyChecking=no $ADMIN_USER@${DEPLOY_HOST} "sudo mkdir -p /etc/nginx/conf.d; sudo mv /tmp/proxy-home.conf /etc/nginx/conf.d && sudo systemctl restart hgproxy.service"
      # - ssh -i /tmp/sshkey -o StrictHostKeyChecking=no $ADMIN_USER@${DEPLOY_HOST} "sudo mv /tmp/proxy-home.conf /etc/hgproxy"
      # - ssh -i /tmp/sshkey -o StrictHostKeyChecking=no $ADMIN_USER@${DEPLOY_HOST} "sudo systemctl restart hgproxy.service"


@@ 133,7 133,7 @@ deploy-and-restart:
  <<: *server-connector-template
  stage: deploy
  script:
    - scp -i /tmp/sshkey -o StrictHostKeyChecking=no ./prod-conf/${SERVICE} $ADMIN_USER@${DEPLOY_HOST}:/tmp
    - scp -i /tmp/sshkey -o StrictHostKeyChecking=no ./prod/${SERVICE} $ADMIN_USER@${DEPLOY_HOST}:/tmp
    - ssh -i /tmp/sshkey -o StrictHostKeyChecking=no $ADMIN_USER@${DEPLOY_HOST} "sudo mv /tmp/${SERVICE} /etc/systemd/system/ && sudo systemctl daemon-reload"
    - ssh -i /tmp/sshkey -o StrictHostKeyChecking=no $ADMIN_USER@${DEPLOY_HOST} "sudo systemctl enable ${SERVICE}; sudo systemctl restart ${SERVICE}"
  retry: 1

M package.json => package.json +1 -1
@@ 1,6 1,6 @@
{
  "name": "home",
  "version": "2.10.0",
  "version": "2.10.1",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve",