Merge branch 'master' of https://git.willaspace.com/external-projects/cssd-back

.drone.yml

@@ -8,13 +8,12 @@ clone:
 # npm config set _auth token add command
 steps:
   - name: clone
-    image: docker.willaspace.com/repository/docker-hosted/alpine/git
+    image: docker-proxy.willaspace.com/alpine/git
     commands:
       - git clone $DRONE_GIT_HTTP_URL .
       - git checkout $DRONE_COMMIT
   - name: Build docker image
-    image: plugins/docker
-    mirror: https://docker.willaspace.com/repository/docker-hosted/
+    image: docker-proxy.willaspace.com/plugins/docker
     environment:
       REGISTRY_USER_NAME:
         from_secret: registry_username
@@ -41,8 +40,7 @@ steps:
         - push
 
   - name: Build docker nginx image
-    image: plugins/docker
-    mirror: https://docker.willaspace.com/repository/docker-hosted/
+    image: docker-proxy.willaspace.com/plugins/docker
     settings:
       tags:
         - nginx-latest
@@ -61,7 +59,7 @@ steps:
         - push
 
   - name: deploy
-    image: docker.willaspace.com/repository/docker-hosted/pelotech/drone-helm3:latest
+    image: docker-proxy.willaspace.com/pelotech/drone-helm3:latest
     environment:
       USERNAME:
         from_secret: registry_username

.values.yaml

@@ -392,13 +392,15 @@ ingress:
 
   # List of host addresses to be exposed by this Ingress
   hosts:
-    - host: cssd-doc.ir
-    - host: cssd-doc.com
+    - host: www.cssd-doc.ir
+    - host: www.cssd-doc.com
   # Additional labels for this Ingress
   additionalLabels:
 
   # Add annotations to this Ingress
   annotations:
+    ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
   # kubernetes.io/ingress.class: external-ingress
   # ingress.kubernetes.io/rewrite-target: /
   # ingress.kubernetes.io/force-ssl-redirect: true
@@ -408,10 +410,10 @@ ingress:
     # Secrets must be manually created in the namespace.
     - secretName: cssd-doc-ir-certificate
       hosts:
-        - cssd-doc.ir
+        - www.cssd-doc.ir
     - secretName: cssd-doc-com-certificate
       hosts:
-        - cssd-doc.com
+        - www.cssd-doc.com
 
 ##########################################################
 # Route object for exposing services (OpenShift)
@@ -574,13 +576,19 @@ configMap:
                 listen 80;
                 server_name cssd-doc.ir www.cssd-doc.ir;
 
-                return 301 https://cssd-doc.com$request_uri;
+                return 301 https://www.cssd-doc.com$request_uri;
             }
 
-
             server {
                 listen 80;
-                server_name cssd-doc.com www.cssd-doc.com;
+                server_name cssd-doc.com;
+
+                return 301 https://www.cssd-doc.com$request_uri;
+            }
+
+            server {
+                listen 80;
+                server_name www.cssd-doc.com;
 
                 access_log /var/log/nginx/access.log main;
                 error_log /var/log/nginx/error.log;

docker-compose.yml

@@ -1,21 +0,0 @@
-version: '2'
-
-services:
-
-  app:
-    container_name: cssd
-    image: registry.willaspace.com/willaspace/cssd
-    #build:
-    #  context: ./
-    volumes:
-      - /home/administrator/apps/nginx/www/cssd/storage:/var/www/storage
-      - /home/administrator/apps/nginx/www/cssd/public:/var/www/public
-    env_file: '.env'
-    environment:
-      - "DB_HOST=mysql_database"
-      - "REDIS_HOST=cache"
-
-networks:
-  default:
-    external:
-      name: willaengine_default