Merge branch 'master' of gitlab.com:iimtt/iimtt.org into dns

.gitlab-ci.yml

@@ -8,10 +8,10 @@ before_script:
   - "which rsync || ( apt-get update -y && apt-get install rsync -y )"
   #- "which yarn || ( apt-get update -y && apt-get install yarn -y )"
   - eval $(ssh-agent -s)
-  - echo "$v8_pk" | tr -d '\r' | ssh-add - > /dev/null
+  - echo "$u1n3_pk" | tr -d '\r' | ssh-add - > /dev/null
   - mkdir -p ~/.ssh
   - chmod 700 ~/.ssh
-  - ssh-keyscan -p 22 $v8_ip >> ~/.ssh/known_hosts
+  - ssh-keyscan -p 22 $u1n3_ip >> ~/.ssh/known_hosts
   - chmod 644 ~/.ssh/known_hosts
   #- mkdir CONFIG
   #- echo $config > $CI_PROJECT_DIR/CONFIG/config.php
@@ -20,10 +20,10 @@ before_script:
 deploy:
   stage: deploy
   script:
-    - rsync -Ppr -e "ssh -p 22" --progress --exclude=".git" $CI_PROJECT_DIR/ $v8_user@$v8_ip:$v8_pwd
+    - rsync -Ppr -e "ssh -p 22" --progress --exclude=".git" $CI_PROJECT_DIR/ $u1n3_user@$u1n3_ip:$u1n3_pwd
     # Non interactive ssh gracefully reloads server
     #- ssh $hawk_bs_user@$hawk_bs_ip '. /etc/profile; pm2 reload all'
   only:
     # Trigger deployments only from production branch
     #- production
-    - stage
+    - master

.htaccess

@@ -0,0 +1,11 @@
+AuthType Basic
+AuthName "Your authorization required message."
+AuthUserFile /home/dev/.htpasswd
+require valid-user
+#RewriteCond %{HTTPS} !=on
+#RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301,NE]
+RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
+RewriteRule ^(.*)$ https://%1/$1 [R=301,L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.*) index.php

.htaccess~12451c3cc16932eaea10491a1f7d244df9da449c

@@ -0,0 +1,7 @@
+#RewriteCond %{HTTPS} !=on
+#RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301,NE]
+RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
+RewriteRule ^(.*)$ https://%1/$1 [R=301,L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.*) index.php