diff --git a/.rancher-pipeline.yml b/.rancher-pipeline.yml index 023e986..266f3c1 100644 --- a/.rancher-pipeline.yml +++ b/.rancher-pipeline.yml @@ -4,9 +4,9 @@ stages: - publishImageConfig: dockerfilePath: ./Dockerfile buildContext: . - tag: registry.wmk8s.com/rene.jochums.at/homepage:${CICD_GIT_TAG} + tag: registry.jochum.dev/rene.jochum.dev/homepage:${CICD_GIT_TAG} pushRemote: true - registry: registry.wmk8s.com + registry: registry.jochum.dev - name: Deploy steps: - applyYamlConfig: @@ -14,7 +14,7 @@ stages: timeout: 60 notification: recipients: - - recipient: rene@webmeisterei.com + - recipient: rene@jochum.dev notifier: local:n-pjmh6 condition: - Success diff --git a/Dockerfile b/Dockerfile index 4d0deb6..37295f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,14 +5,14 @@ COPY . /build WORKDIR /build -RUN hugo -b https://rene.jochums.at -v -t persona +RUN hugo -b https://rene.jochum.dev -v -t persona # Copy to a nginx container FROM nginx:1.17-alpine -LABEL maintainer="René Jochum " +LABEL maintainer="René Jochum " COPY docker/nginx/nginx.conf /etc/nginx/ COPY docker/nginx/default.conf /etc/nginx/conf.d/ -COPY --from=0 /build/public /var/www/rene.jochums.at +COPY --from=0 /build/public /var/www/rene.jochum.dev diff --git a/config.yaml b/config.yaml index d315ae9..20a57f7 100644 --- a/config.yaml +++ b/config.yaml @@ -38,7 +38,7 @@ params: # Settings DateFormat: 2. Jan 2006 - edit_link_url: https://git.webmeisterei.com/jochum/rene.jochums.at/tree/master/content/ + edit_link_url: https://git.jochum.dev/jochum/rene.jochum.dev/tree/master/content/ description: "Blogging about Programming, Security, Linux, Networking and Web Apps." logo: "/static/author/pcdummy_240x240.png" @@ -50,7 +50,7 @@ params: # twitter: "pcdummy" # facebook: "pcdummy" linkedin: pcdummy - email: rene@jochums.at + email: rene@jochum.dev skype: pc-dummy Authors: diff --git a/deployment.yaml b/deployment.yaml index c994050..652e933 100644 --- a/deployment.yaml +++ b/deployment.yaml @@ -4,11 +4,8 @@ items: - apiVersion: extensions/v1beta1 kind: Deployment metadata: - annotations: - deployment.kubernetes.io/revision: "1" - generation: 3 name: nginx - namespace: rene-jochums-at + namespace: rene-jochum-dev spec: progressDeadlineSeconds: 600 replicas: 1 @@ -27,7 +24,7 @@ items: container: nginx spec: containers: - - image: registry.wmk8s.com/rene.jochums.at/homepage:${CICD_GIT_TAG} + - image: registry.jochum.dev/rene.jochum.dev/homepage:${CICD_GIT_TAG} imagePullPolicy: IfNotPresent name: nginx resources: {} @@ -67,15 +64,15 @@ items: apiVersion: extensions/v1beta1 metadata: annotations: - certmanager.k8s.io/cluster-issuer: letsencrypt-prod + cert-manager.io/cluster-issuer: letsencrypt-prod kubernetes.io/tls-acme: "true" nginx.ingress.kubernetes.io/ssl-redirect: "true" generation: 2 - name: website - namespace: rene-jochums-at + name: rene.jochum.dev + namespace: rene-jochum-dev spec: rules: - - host: rene.jochums.at + - host: rene.jochum.dev http: paths: - backend: @@ -85,4 +82,4 @@ items: tls: - hosts: - rene.jochums.at - secretName: website-prod-tls \ No newline at end of file + secretName: rene-jochum-dev-tls \ No newline at end of file diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 2df2d62..245334e 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -4,5 +4,5 @@ server { error_log /dev/stderr; access_log /dev/stdout; - root /var/www/rene.jochums.at; + root /var/www/rene.jochum.dev; } \ No newline at end of file