From 915230e15e25b7f2c38b653198854f0801d01825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Amcoff?= Date: Sat, 1 Aug 2020 11:09:55 +0200 Subject: [PATCH 1/7] Add Helm Chart - TODO: Add NGINX pod for caching. --- .helmignore | 26 ++++++++ Chart.yaml | 23 +++++++ templates/NOTES.txt | 21 +++++++ templates/_helpers.tpl | 63 ++++++++++++++++++++ templates/deployment.yaml | 59 ++++++++++++++++++ templates/hpa.yaml | 28 +++++++++ templates/ingress.yaml | 41 +++++++++++++ templates/service.yaml | 15 +++++ templates/serviceaccount.yaml | 12 ++++ templates/tests/test-connection.yaml | 15 +++++ values.yaml | 89 ++++++++++++++++++++++++++++ 11 files changed, 392 insertions(+) create mode 100644 .helmignore create mode 100644 Chart.yaml create mode 100644 templates/NOTES.txt create mode 100644 templates/_helpers.tpl create mode 100644 templates/deployment.yaml create mode 100644 templates/hpa.yaml create mode 100644 templates/ingress.yaml create mode 100644 templates/service.yaml create mode 100644 templates/serviceaccount.yaml create mode 100644 templates/tests/test-connection.yaml create mode 100644 values.yaml diff --git a/.helmignore b/.helmignore new file mode 100644 index 0000000..4a77bf2 --- /dev/null +++ b/.helmignore @@ -0,0 +1,26 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ + +# Dependencies +target diff --git a/Chart.yaml b/Chart.yaml new file mode 100644 index 0000000..e7e72cf --- /dev/null +++ b/Chart.yaml @@ -0,0 +1,23 @@ +apiVersion: v2 +name: pxcmprs-server +description: pxcmprs-server Helm chart + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: 0.1.0 diff --git a/templates/NOTES.txt b/templates/NOTES.txt new file mode 100644 index 0000000..4347fff --- /dev/null +++ b/templates/NOTES.txt @@ -0,0 +1,21 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "pxcmprs-server.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "pxcmprs-server.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "pxcmprs-server.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "pxcmprs-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80 +{{- end }} diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl new file mode 100644 index 0000000..429a9b4 --- /dev/null +++ b/templates/_helpers.tpl @@ -0,0 +1,63 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "pxcmprs-server.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "pxcmprs-server.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "pxcmprs-server.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "pxcmprs-server.labels" -}} +helm.sh/chart: {{ include "pxcmprs-server.chart" . }} +{{ include "pxcmprs-server.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "pxcmprs-server.selectorLabels" -}} +app.kubernetes.io/name: {{ include "pxcmprs-server.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "pxcmprs-server.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "pxcmprs-server.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/templates/deployment.yaml b/templates/deployment.yaml new file mode 100644 index 0000000..a43e921 --- /dev/null +++ b/templates/deployment.yaml @@ -0,0 +1,59 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "pxcmprs-server.fullname" . }} + labels: + {{- include "pxcmprs-server.labels" . | nindent 4 }} +spec: +{{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} +{{- end }} + selector: + matchLabels: + {{- include "pxcmprs-server.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "pxcmprs-server.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "pxcmprs-server.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 80 + protocol: TCP + livenessProbe: + tcpSocket: + port: http + readinessProbe: + tcpSocket: + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/templates/hpa.yaml b/templates/hpa.yaml new file mode 100644 index 0000000..de6ad39 --- /dev/null +++ b/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "pxcmprs-server.fullname" . }} + labels: + {{- include "pxcmprs-server.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "pxcmprs-server.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/templates/ingress.yaml b/templates/ingress.yaml new file mode 100644 index 0000000..2a2bd2f --- /dev/null +++ b/templates/ingress.yaml @@ -0,0 +1,41 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "pxcmprs-server.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "pxcmprs-server.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ . }} + backend: + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} diff --git a/templates/service.yaml b/templates/service.yaml new file mode 100644 index 0000000..471158f --- /dev/null +++ b/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "pxcmprs-server.fullname" . }} + labels: + {{- include "pxcmprs-server.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "pxcmprs-server.selectorLabels" . | nindent 4 }} diff --git a/templates/serviceaccount.yaml b/templates/serviceaccount.yaml new file mode 100644 index 0000000..fea2651 --- /dev/null +++ b/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "pxcmprs-server.serviceAccountName" . }} + labels: + {{- include "pxcmprs-server.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/templates/tests/test-connection.yaml b/templates/tests/test-connection.yaml new file mode 100644 index 0000000..a5f0485 --- /dev/null +++ b/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "pxcmprs-server.fullname" . }}-test-connection" + labels: + {{- include "pxcmprs-server.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test-success +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "pxcmprs-server.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/values.yaml b/values.yaml new file mode 100644 index 0000000..55b04d3 --- /dev/null +++ b/values.yaml @@ -0,0 +1,89 @@ +# Default values for pxcmprs-server. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: pxcmprs/server + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart version. + tag: "v0.1.0" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: NodePort + port: 80 + +ingress: + enabled: false + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: pxcmprs-server.local + paths: [] + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + + # enabled: true + # annotations: + # traefik.ingress.kubernetes.io/router.entrypoints: websecure + # traefik.ingress.kubernetes.io/router.tls: "true" + # traefik.ingress.kubernetes.io/router.tls.certresolver: le-http + # hosts: + # - host: pxcmprs.lynx.agency + # paths: + # - "/" + +resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: + cpu: 1000m + memory: 512Mi + requests: + cpu: 1000m + memory: 256Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + # targetCPUUtilizationPercentage: 80 + targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} From ba0346d7f01ad84044e9eb720b63f8828c420672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Amcoff?= Date: Sat, 1 Aug 2020 23:11:17 +0200 Subject: [PATCH 2/7] Add Nginx --- Chart.lock | 6 ++++ Chart.yaml | 7 +++++ charts/nginx-6.0.2.tgz | Bin 0 -> 15051 bytes templates/NOTES.txt | 21 ------------- templates/_helpers.tpl | 11 ------- templates/config.yaml | 10 ++++++ templates/deployment.yaml | 4 ++- templates/serviceaccount.yaml | 12 -------- values.yaml | 56 +++++++++++++++++++++++++++------- 9 files changed, 71 insertions(+), 56 deletions(-) create mode 100644 Chart.lock create mode 100644 charts/nginx-6.0.2.tgz delete mode 100644 templates/NOTES.txt create mode 100644 templates/config.yaml delete mode 100644 templates/serviceaccount.yaml diff --git a/Chart.lock b/Chart.lock new file mode 100644 index 0000000..693a999 --- /dev/null +++ b/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: nginx + repository: https://charts.bitnami.com/bitnami + version: ~6.0.2 +digest: sha256:51c8b6194cbe026dceb023c02e83cff29e27732591fd6b3336b2de57c942ccb3 +generated: "2020-08-01T22:20:14.2891455+02:00" diff --git a/Chart.yaml b/Chart.yaml index e7e72cf..b8a09bd 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -21,3 +21,10 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. appVersion: 0.1.0 + +dependencies: +- name: nginx + version: "~6.0.2" + repository: "https://charts.bitnami.com/bitnami" + condition: nginx.enabled + alias: nginx diff --git a/charts/nginx-6.0.2.tgz b/charts/nginx-6.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..6310ef1b7b51632d0bb4de8e3719d13242ca84cb GIT binary patch literal 15051 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 literal 0 HcmV?d00001 diff --git a/templates/NOTES.txt b/templates/NOTES.txt deleted file mode 100644 index 4347fff..0000000 --- a/templates/NOTES.txt +++ /dev/null @@ -1,21 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "pxcmprs-server.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "pxcmprs-server.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "pxcmprs-server.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "pxcmprs-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80 -{{- end }} diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 429a9b4..6a30e41 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -50,14 +50,3 @@ Selector labels app.kubernetes.io/name: {{ include "pxcmprs-server.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "pxcmprs-server.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "pxcmprs-server.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/templates/config.yaml b/templates/config.yaml new file mode 100644 index 0000000..4cf835a --- /dev/null +++ b/templates/config.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "pxcmprs-server.fullname" . }} + labels: + {{- include "pxcmprs-server.labels" . | nindent 4 }} +{{- with .Values.settings }} +data: + {{- toYaml . | nindent 2 }} +{{- end }} \ No newline at end of file diff --git a/templates/deployment.yaml b/templates/deployment.yaml index a43e921..881092e 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -24,7 +24,6 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "pxcmprs-server.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: @@ -33,6 +32,9 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + envFrom: + - configMapRef: + name: {{ include "pxcmprs-server.fullname" . }} ports: - name: http containerPort: 80 diff --git a/templates/serviceaccount.yaml b/templates/serviceaccount.yaml deleted file mode 100644 index fea2651..0000000 --- a/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "pxcmprs-server.serviceAccountName" . }} - labels: - {{- include "pxcmprs-server.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/values.yaml b/values.yaml index 55b04d3..caad0e3 100644 --- a/values.yaml +++ b/values.yaml @@ -36,10 +36,15 @@ securityContext: {} # runAsNonRoot: true # runAsUser: 1000 +settings: + # PXCMPRS_FETCH__ALLOWED_HOSTS: "unsplash.com|.*\\.?xn--sdermalmsskolan-8sb\\.com" + # PXCMPRS_FETCH__MAX_SIZE: "33554432" # 32 MiB + service: - type: NodePort + type: ClusterIP port: 80 +# Ingress. Routes directly to pxcmprs-server – use nginx.ingress instead if you wish to route via Nginx. ingress: enabled: false annotations: {} @@ -53,16 +58,6 @@ ingress: # hosts: # - chart-example.local - # enabled: true - # annotations: - # traefik.ingress.kubernetes.io/router.entrypoints: websecure - # traefik.ingress.kubernetes.io/router.tls: "true" - # traefik.ingress.kubernetes.io/router.tls.certresolver: le-http - # hosts: - # - host: pxcmprs.lynx.agency - # paths: - # - "/" - resources: # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little @@ -87,3 +82,42 @@ nodeSelector: {} tolerations: [] affinity: {} + +nginx: + enabled: true + service: + type: ClusterIP + ingress: + enabled: false + # enabled: true + # annotations: + # traefik.ingress.kubernetes.io/router.entrypoints: websecure + # traefik.ingress.kubernetes.io/router.tls: "true" + # traefik.ingress.kubernetes.io/router.tls.certresolver: le-http + # hosts: + # - host: pxcmprs.lynx.agency + # paths: + # - "/" + serverBlock: |- + proxy_cache_path /opt/bitnami/nginx/cache use_temp_path=off levels=1:2 keys_zone=cache_zone:100m max_size=100m inactive=1d; + + server { + resolver 8.8.8.8; + listen 8080 default_server; + + location / { + expires 1d; + proxy_cache cache_zone; + proxy_cache_valid 200 302 301 1d; + # Add the `Accept` header as a cache key since Pxcmprs uses that to determine if the client supports WebP pictures. This is a sub-optimal solution, but it works fine. + proxy_cache_key "$http_accept$request_uri"; + proxy_cache_methods GET HEAD; + proxy_cache_lock on; + proxy_pass http://pxcmprs-server; # Change this if nameOverride is used! + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + add_header pxcmprs-cache $upstream_cache_status; + proxy_ignore_headers "Set-Cookie"; + } + } \ No newline at end of file From 13124388016e633e68bf61c6e0bf215c0487d671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Amcoff?= Date: Sun, 16 Aug 2020 10:40:52 +0200 Subject: [PATCH 3/7] Fix settings display --- src/settings.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.rs b/src/settings.rs index 3fdcada..3ad3a3e 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -63,7 +63,7 @@ impl fmt::Display for Settings { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!( f, - "Fetch settings:\n{}\nServer settings:\n{}Transform settings:\n{}", + "Fetch settings:\n{}\nServer settings:\n{}\nTransform settings:\n{}", self.fetch, self.server, self.transform ) } From 06f0897837ce85cb0287dc20da5165df75ef0226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Amcoff?= Date: Sun, 16 Aug 2020 10:58:20 +0200 Subject: [PATCH 4/7] Fix values.yaml --- values.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/values.yaml b/values.yaml index caad0e3..ebcd957 100644 --- a/values.yaml +++ b/values.yaml @@ -95,9 +95,7 @@ nginx: # traefik.ingress.kubernetes.io/router.tls: "true" # traefik.ingress.kubernetes.io/router.tls.certresolver: le-http # hosts: - # - host: pxcmprs.lynx.agency - # paths: - # - "/" + # - name: pxcmprs.lynx.agency serverBlock: |- proxy_cache_path /opt/bitnami/nginx/cache use_temp_path=off levels=1:2 keys_zone=cache_zone:100m max_size=100m inactive=1d; From 2634eb907d510a8313fb31149d40713be76b892c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Amcoff?= Date: Fri, 25 Sep 2020 16:38:54 +0200 Subject: [PATCH 5/7] smol fixes --- .github/dependabot.yml | 2 +- Chart.yaml | 10 +++++----- README.md | 2 +- docker-compose.yaml | 2 +- values.yaml | 26 +++++++++++++------------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 300200b..8dec9d4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,4 +4,4 @@ updates: directory: "/" target-branch: "develop" schedule: - interval: "daily" \ No newline at end of file + interval: "daily" diff --git a/Chart.yaml b/Chart.yaml index b8a09bd..63e1018 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -23,8 +23,8 @@ version: 0.1.0 appVersion: 0.1.0 dependencies: -- name: nginx - version: "~6.0.2" - repository: "https://charts.bitnami.com/bitnami" - condition: nginx.enabled - alias: nginx + - name: nginx + version: "~6.0.2" + repository: "https://charts.bitnami.com/bitnami" + condition: nginx.enabled + alias: nginx diff --git a/README.md b/README.md index 40e0019..8400f09 100644 --- a/README.md +++ b/README.md @@ -29,4 +29,4 @@ This image taken by the Hubble Space Telescope is a 3857×2893 JPEG. Its size is about 2.6 MiB. To convert it to WebP, you must first encode the url ([https://cdn.spacetelescope.org/archives/images/large/heic0206b.jpg](https://cdn.spacetelescope.org/archives/images/large/heic0206b.jpg)) to base64. The URL safe variant used by pxcmprs-core results in `aHR0cHM6Ly9jZG4uc3BhY2V0ZWxlc2NvcGUub3JnL2FyY2hpdmVzL2ltYWdlcy9sYXJnZS9oZWljMDIwNmIuanBn`. -`GET /aHR0cHM6Ly9jZG4uc3BhY2V0ZWxlc2NvcGUub3JnL2FyY2hpdmVzL2ltYWdlcy9sYXJnZS9oZWljMDIwNmIuanBn` returns the new image, auto-converted to either JPEG or WebP based on the client's `accept` header in order for older browsers – I'm looking at you, Internet Explorer – to be happy. If you want to force convert to `PNG`, just add a `.png` extension to the url. \ No newline at end of file +`GET /aHR0cHM6Ly9jZG4uc3BhY2V0ZWxlc2NvcGUub3JnL2FyY2hpdmVzL2ltYWdlcy9sYXJnZS9oZWljMDIwNmIuanBn` returns the new image, auto-converted to either JPEG or WebP based on the client's `accept` header in order for older browsers – I'm looking at you, Internet Explorer – to be happy. If you want to force convert to `PNG`, just add a `.png` extension to the url. diff --git a/docker-compose.yaml b/docker-compose.yaml index 54f5655..7f9a9f6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,4 +7,4 @@ services: ports: - "3000:80" pxcmprs-server: - build: . \ No newline at end of file + build: . diff --git a/values.yaml b/values.yaml index caad0e3..f579377 100644 --- a/values.yaml +++ b/values.yaml @@ -37,8 +37,8 @@ securityContext: {} # runAsUser: 1000 settings: - # PXCMPRS_FETCH__ALLOWED_HOSTS: "unsplash.com|.*\\.?xn--sdermalmsskolan-8sb\\.com" - # PXCMPRS_FETCH__MAX_SIZE: "33554432" # 32 MiB + PXCMPRS_FETCH__ALLOWED_HOSTS: "unsplash\\.com|.*\\.?xn--sdermalmsskolan-8sb\\.com|cdn\\.discordapp\\.com" + PXCMPRS_FETCH__MAX_SIZE: "33554432" # 32 MiB service: type: ClusterIP @@ -88,16 +88,16 @@ nginx: service: type: ClusterIP ingress: - enabled: false - # enabled: true - # annotations: - # traefik.ingress.kubernetes.io/router.entrypoints: websecure - # traefik.ingress.kubernetes.io/router.tls: "true" - # traefik.ingress.kubernetes.io/router.tls.certresolver: le-http - # hosts: - # - host: pxcmprs.lynx.agency - # paths: - # - "/" + # enabled: false + enabled: true + annotations: + traefik.ingress.kubernetes.io/router.entrypoints: websecure + traefik.ingress.kubernetes.io/router.tls: "true" + traefik.ingress.kubernetes.io/router.tls.certresolver: le-http + hosts: + - host: pxcmprs.lynx.agency + paths: + - "/" serverBlock: |- proxy_cache_path /opt/bitnami/nginx/cache use_temp_path=off levels=1:2 keys_zone=cache_zone:100m max_size=100m inactive=1d; @@ -113,7 +113,7 @@ nginx: proxy_cache_key "$http_accept$request_uri"; proxy_cache_methods GET HEAD; proxy_cache_lock on; - proxy_pass http://pxcmprs-server; # Change this if nameOverride is used! + proxy_pass http://pxcmprs-pxcmprs-server; # Change this if nameOverride is used! proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From 9a509c870693a66aedbe2c423abac7763544dd60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Amcoff?= Date: Fri, 25 Sep 2020 17:56:16 +0200 Subject: [PATCH 6/7] fix nginx ingress host --- values.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/values.yaml b/values.yaml index f579377..db61c8f 100644 --- a/values.yaml +++ b/values.yaml @@ -94,10 +94,7 @@ nginx: traefik.ingress.kubernetes.io/router.entrypoints: websecure traefik.ingress.kubernetes.io/router.tls: "true" traefik.ingress.kubernetes.io/router.tls.certresolver: le-http - hosts: - - host: pxcmprs.lynx.agency - paths: - - "/" + hostname: pxcmprs.lynx.agency serverBlock: |- proxy_cache_path /opt/bitnami/nginx/cache use_temp_path=off levels=1:2 keys_zone=cache_zone:100m max_size=100m inactive=1d; From 37810c2e269117f1afe6f9dc8e6a33e0250a9f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Amcoff?= Date: Fri, 25 Sep 2020 19:43:48 +0200 Subject: [PATCH 7/7] v0.1.1 --- Cargo.lock | 376 +++++++++++++++++++++++++++++++++++++++++----------- Cargo.toml | 5 +- Chart.yaml | 4 +- src/main.rs | 9 +- values.yaml | 4 +- 5 files changed, 313 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4bcfbfe..41a07a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,45 +14,59 @@ dependencies = [ "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "actix-codec" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "pin-project 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "actix-connect" -version = "1.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-codec 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-utils 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.9 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "trust-dns-proto 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", - "trust-dns-resolver 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", + "trust-dns-proto 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)", + "trust-dns-resolver 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "actix-http" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-connect 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-codec 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-connect 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-utils 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", + "cookie 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", "copyless 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.9 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_rs 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -62,6 +76,7 @@ dependencies = [ "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -73,9 +88,9 @@ dependencies = [ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sha-1 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -120,7 +135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -134,7 +149,7 @@ dependencies = [ [[package]] name = "actix-service" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -149,7 +164,7 @@ dependencies = [ "actix-macros 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -170,31 +185,46 @@ dependencies = [ [[package]] name = "actix-tls" -version = "1.0.0" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "actix-codec 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-utils 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "actix-utils" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "derive_more 0.99.9 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "pin-project 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", + "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "actix-utils" -version = "1.0.6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-codec 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-sink 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -202,42 +232,45 @@ dependencies = [ [[package]] name = "actix-web" -version = "2.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-codec 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-macros 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "actix-router 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-server 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "actix-testing 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "actix-threadpool 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-web-codegen 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "awc 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-tls 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-utils 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-web-codegen 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "awc 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.9 (registry+https://github.com/rust-lang/crates.io-index)", "encoding_rs 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project 0.4.22 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "tinyvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "actix-web-codegen" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -298,14 +331,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "awc" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-codec 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-http 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-service 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.99.9 (registry+https://github.com/rust-lang/crates.io-index)", "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -332,8 +365,8 @@ dependencies = [ ] [[package]] -name = "base64" -version = "0.11.0" +name = "base-x" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -346,6 +379,14 @@ name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "generic-array 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "brotli-sys" version = "0.3.2" @@ -417,16 +458,6 @@ dependencies = [ "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "chrono" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "cloudabi" version = "0.0.3" @@ -455,6 +486,21 @@ dependencies = [ "yaml-rust 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "const_fn" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cookie" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "copyless" version = "0.1.5" @@ -474,6 +520,11 @@ name = "core-foundation-sys" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "cpuid-bool" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "crc32fast" version = "1.2.0" @@ -554,6 +605,19 @@ dependencies = [ "syn 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "generic-array 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "dtoa" version = "0.4.6" @@ -757,6 +821,15 @@ dependencies = [ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "getrandom" version = "0.1.14" @@ -1332,6 +1405,11 @@ name = "once_cell" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "openssl" version = "0.10.30" @@ -1505,10 +1583,9 @@ dependencies = [ [[package]] name = "pxcmprs-server" -version = "0.1.0" +version = "0.1.1" dependencies = [ - "actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "actix-web 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "actix-web 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", "chashmap 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "config 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1865,6 +1942,18 @@ dependencies = [ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "sha-1" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "block-buffer 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cpuid-bool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "digest 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "opaque-debug 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "sha1" version = "0.6.0" @@ -1913,11 +2002,64 @@ name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "standback" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "stdweb-internal-macros 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "stdweb-internal-runtime 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base-x 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", + "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "syn" version = "0.15.44" @@ -1962,6 +2104,24 @@ dependencies = [ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "thiserror" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "thiserror-impl 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "thread_local" version = "1.0.1" @@ -2008,6 +2168,41 @@ dependencies = [ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "time" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "const_fn 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)", + "standback 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", + "time-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "time-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)", + "time-macros-impl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro-hack 0.5.16 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "standback 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "tinyvec" version = "0.3.3" @@ -2101,30 +2296,30 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.18.0-alpha.2" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "async-trait 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)", "enum-as-inner 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "trust-dns-resolver" -version = "0.18.0-alpha.2" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "backtrace 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "ipconfig 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2132,8 +2327,9 @@ dependencies = [ "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "resolv-conf 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", - "trust-dns-proto 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", + "trust-dns-proto 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2141,6 +2337,11 @@ name = "try-lock" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "typenum" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "unicase" version = "2.6.0" @@ -2363,19 +2564,21 @@ dependencies = [ [metadata] "checksum actix-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380" -"checksum actix-connect 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c95cc9569221e9802bf4c377f6c18b90ef10227d787611decf79fd47d2a8e76c" -"checksum actix-http 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c16664cc4fdea8030837ad5a845eb231fb93fc3c5c171edfefb52fad92ce9019" +"checksum actix-codec 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" +"checksum actix-connect 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc" +"checksum actix-http 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05dd80ba8f27c4a34357c07e338c8f5c38f8520e6d626ca1727d8fecc41b0cab" "checksum actix-macros 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a60f9ba7c4e6df97f3aacb14bb5c0cd7d98a49dcbaed0d7f292912ad9a6a3ed2" "checksum actix-router 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9d7a10ca4d94e8c8e7a87c5173aba1b97ba9a6563ca02b0e1cd23531093d3ec8" "checksum actix-rt 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "143fcc2912e0d1de2bcf4e2f720d2a60c28652ab4179685a1ee159e0fb3db227" "checksum actix-server 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6d74b464215a473c973a2d7d03a69cc10f4ce1f4b38a7659c5193dc5c675630" -"checksum actix-service 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d3e4fc95dfa7e24171b2d0bb46b85f8ab0e8499e4e3caec691fc4ea65c287564" +"checksum actix-service 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" "checksum actix-testing 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47239ca38799ab74ee6a8a94d1ce857014b2ac36f242f70f3f75a66f691e791c" "checksum actix-threadpool 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "91164716d956745c79dcea5e66d2aa04506549958accefcede5368c70f2fd4ff" -"checksum actix-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4e5b4faaf105e9a6d389c606c298dcdb033061b00d532af9df56ff3a54995a8" +"checksum actix-tls 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb" "checksum actix-utils 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fcf8f5631bf01adec2267808f00e228b761c60c0584cc9fa0b5364f41d147f4e" -"checksum actix-web 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3158e822461040822f0dbf1735b9c2ce1f95f93b651d7a7aded00b1efbb1f635" -"checksum actix-web-codegen 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a71bf475cbe07281d0b3696abb48212db118e7e23219f13596ce865235ff5766" +"checksum actix-utils 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a" +"checksum actix-web 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "36de80175eb1f0a5c518024ce0d23646b54a23008279e090ca1848f6f1448bf4" +"checksum actix-web-codegen 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "750ca8fb60bbdc79491991650ba5d2ae7cd75f3fc00ead51390cfe9efda0d4d8" "checksum addr2line 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" "checksum adler 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" "checksum adler32 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" @@ -2384,11 +2587,12 @@ dependencies = [ "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" "checksum async-trait 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d0385eb92" "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -"checksum awc 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d7601d4d1d7ef2335d6597a41b5fe069f6ab799b85f53565ab390e7b7065aac5" +"checksum awc 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "150e00c06683ab44c5f97d033950e5d87a7a042d06d77f5eecb443cbd23d0575" "checksum backtrace 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)" = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" -"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" +"checksum base-x 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1" "checksum base64 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +"checksum block-buffer 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" "checksum bumpalo 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" @@ -2399,13 +2603,15 @@ dependencies = [ "checksum cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum chashmap 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff41a3c2c1e39921b9003de14bf0439c7b63a9039637c291e1a64925d8ddfa45" -"checksum chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" "checksum config 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" +"checksum const_fn 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ce90df4c658c62f12d78f7508cf92f9173e5184a539c10bfe54a3107b3ffd0f2" +"checksum cookie 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0" "checksum copyless 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" "checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" "checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +"checksum cpuid-bool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" "checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" "checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" @@ -2414,6 +2620,8 @@ dependencies = [ "checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" "checksum deflate 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" "checksum derive_more 0.99.9 (registry+https://github.com/rust-lang/crates.io-index)" = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76" +"checksum digest 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +"checksum discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" "checksum dtoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" "checksum encoding_rs 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171" @@ -2438,6 +2646,7 @@ dependencies = [ "checksum futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" "checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" "checksum generator 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68" +"checksum generic-array 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" "checksum gif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af" "checksum gimli 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" @@ -2502,6 +2711,7 @@ dependencies = [ "checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" "checksum object 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" "checksum once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +"checksum opaque-debug 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" "checksum openssl 0.10.30 (registry+https://github.com/rust-lang/crates.io-index)" = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" "checksum openssl-sys 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)" = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" @@ -2562,6 +2772,7 @@ dependencies = [ "checksum serde_regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" +"checksum sha-1 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" "checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" @@ -2569,16 +2780,26 @@ dependencies = [ "checksum smallvec 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f" "checksum socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" "checksum stable_deref_trait 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +"checksum standback 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "33a71ea1ea5f8747d1af1979bfb7e65c3a025a70609f04ceb78425bc5adad8e6" "checksum static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +"checksum stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +"checksum stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +"checksum stdweb-internal-macros 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +"checksum stdweb-internal-runtime 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" "checksum syn 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b" "checksum synstructure 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +"checksum thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +"checksum thiserror-impl 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" "checksum threadpool 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" "checksum tiff 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d" "checksum tiff 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f3b8a87c4da944c3f27e5943289171ac71a6150a79ff6bacfff06d159dfff2f" "checksum time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +"checksum time 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "2c2e31fb28e2a9f01f5ed6901b066c1ba2333c04b64dc61254142bafcb3feb2c" +"checksum time-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ae9b6e9f095bc105e183e3cd493d72579be3181ad4004fceb01adbe9eecab2d" +"checksum time-macros-impl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" "checksum tinyvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" "checksum tokio 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58" "checksum tokio-tls 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" @@ -2588,9 +2809,10 @@ dependencies = [ "checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" "checksum tracing 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c2e2a2de6b0d5cbb13fc21193a2296888eaab62b6044479aafb3c54c01c29fcd" "checksum tracing-core 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f" -"checksum trust-dns-proto 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2a7f3a2ab8a919f5eca52a468866a67ed7d3efa265d48a652a9a3452272b413f" -"checksum trust-dns-resolver 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6f90b1502b226f8b2514c6d5b37bafa8c200d7ca4102d57dc36ee0f3b7a04a2f" +"checksum trust-dns-proto 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd7061ba6f4d4d9721afedffbfd403f20f39a4301fee1b70d6fcd09cca69f28" +"checksum trust-dns-resolver 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0f23cdfdc3d8300b3c50c9e84302d3bd6d860fb9529af84ace6cf9665f181b77" "checksum try-lock 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +"checksum typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" "checksum unicode-normalization 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" diff --git a/Cargo.toml b/Cargo.toml index 09167dd..454a3c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pxcmprs-server" -version = "0.1.0" +version = "0.1.1" authors = ["Åke Amcoff "] edition = "2018" repository = "https://github.com/pxcmprs/server" @@ -8,8 +8,7 @@ repository = "https://github.com/pxcmprs/server" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -actix-web = "2.0" -actix-rt = "1.0" +actix-web = "3.0" failure = "0.1" serde = "1" image = "0.23" diff --git a/Chart.yaml b/Chart.yaml index 63e1018..dc91d9f 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -15,12 +15,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.1.0 +appVersion: 0.1.1 dependencies: - name: nginx diff --git a/src/main.rs b/src/main.rs index c081d2a..986b59a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -71,7 +71,13 @@ async fn pxcmprs( .body(output)) } -#[actix_rt::main] +async fn index() -> HttpResponse { + HttpResponse::Ok().content_type("text/html; charset=utf-8").body(r#" + + "#) +} + +#[actix_web::main] async fn main() -> std::io::Result<()> { let settings = Settings::new().unwrap(); @@ -84,6 +90,7 @@ async fn main() -> std::io::Result<()> { App::new() .app_data(transform_settings) .app_data(fetch_settings.clone()) + .service(web::resource("/").route(web::get().to(index))) .service( web::resource(["/{source}.{encoding}", "/{source}"]).route(web::get().to(pxcmprs)), ) diff --git a/values.yaml b/values.yaml index db61c8f..58a8afc 100644 --- a/values.yaml +++ b/values.yaml @@ -8,7 +8,7 @@ image: repository: pxcmprs/server pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart version. - tag: "v0.1.0" + tag: "v0.1.1" imagePullSecrets: [] nameOverride: "" @@ -16,7 +16,7 @@ fullnameOverride: "" serviceAccount: # Specifies whether a service account should be created - create: true + create: false # Annotations to add to the service account annotations: {} # The name of the service account to use.