diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c60358..10ad289 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +21,8 @@ before_script: - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh - chmod 700 ~/.ssh - - ssh-keyscan web.cotech.uk > ~/.ssh/known_hosts - - ssh-keyscan 81.95.52.59 >> ~/.ssh/known_hosts + - ssh-keyscan www.cotech.coop > ~/.ssh/known_hosts + - ssh-keyscan 81.95.52.13 >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - bundle install --path vendor @@ -40,13 +40,13 @@ deploy:dev: stage: staging script: - bundle exec jekyll build -d public - - rsync -aqz --delete-after public/ cotech@web.cotech.uk:sites/dev/ + - rsync -aqz --delete-after public/ cotech@www.cotech.coop:sites/dev/ artifacts: paths: - public environment: name: dev - url: https://dev.coops.tech + url: https://dev.cotech.coop only: - master @@ -54,13 +54,13 @@ deploy:production: stage: production script: - bundle exec jekyll build -d public - - rsync -aqz --delete-after public/ cotech@web.cotech.uk:sites/default/ + - rsync -aqz --delete-after public/ cotech@www.cotech.coop:sites/default/ artifacts: paths: - public environment: name: production - url: https://www.coops.tech + url: https://www.cotech.coop only: - master when: manual diff --git a/.htaccess b/.htaccess index 230140c..fdbcc2a 100644 --- a/.htaccess +++ b/.htaccess @@ -13,15 +13,14 @@ AddOutputFilter DEFLATE svg AddOutputFilter DEFLATE css AddOutputFilter DEFLATE js # URL's that changed -Redirect /co-op/the-dot-project https://www.coops.tech/co-op/dot-project -Redirect /coops/ https://www.coops.tech/co-op/ -Redirect /technology/gnu-bash https://www.coops.tech/technology/bash -Redirect /co-op/graphics-coop https://www.coops.tech/co-op/form-and-function +Redirect /coops/ https://www.cotech.coop/co-op/ +Redirect /technology/gnu-bash https://www.cotech.coop/technology/bash +Redirect /co-op/graphics-coop https://www.cotech.coop/co-op/form-and-function # Canonical URLs redirect to the domain with a www RewriteEngine on RewriteCond %{HTTP_HOST} ^coops\.tech$ - RewriteRule ^/?(.*) https://www.coops.tech/$1 [R,L] + RewriteRule ^/?(.*) https://www.cotech.coop/$1 [R,L] # Redirect HTTP to HTTPS # https://wiki.apache.org/httpd/RewriteHTTPToHTTPS