Browse Source

fix vhost: user perms, ssl cache param

Bachir Soussi Chiadmi 5 years ago
parent
commit
239cba9820
3 changed files with 11 additions and 10 deletions
  1. 1 1
      assets/vhosts/drupal-ssl.nginxconf
  2. 1 1
      assets/vhosts/simple-phpfpm-ssl.nginxconf
  3. 9 8
      bin/vhost.sh

+ 1 - 1
assets/vhosts/drupal-ssl.nginxconf

@@ -19,7 +19,7 @@ server {
   ssl_certificate "/etc/letsencrypt/live/DOMAIN.LTD/fullchain.pem";
   ssl_certificate_key "/etc/letsencrypt/live/DOMAIN.LTD/privkey.pem";
   ssl_dhparam /etc/nginx/ssl/certs/DOMAIN.LTD/dhparam.pem;
-  ssl_session_cache shared:SSL:1m;
+  # ssl_session_cache shared:SSL:1m;
   ssl_session_timeout 10m;
   ssl_ciphers HIGH:!aNULL:!MD5;
   #ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;

+ 1 - 1
assets/vhosts/simple-phpfpm-ssl.nginxconf

@@ -36,7 +36,7 @@ server {
   ssl_certificate "/etc/letsencrypt/live/DOMAIN.LTD/fullchain.pem";
   ssl_certificate_key "/etc/letsencrypt/live/DOMAIN.LTD/privkey.pem";
   ssl_dhparam /etc/nginx/ssl/certs/DOMAIN.LTD/dhparam.pem;
-  ssl_session_cache shared:SSL:1m;
+  # ssl_session_cache shared:SSL:1m;
   ssl_session_timeout 10m;
   ssl_ciphers HIGH:!aNULL:!MD5;
   #ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;

+ 9 - 8
bin/vhost.sh

@@ -94,11 +94,9 @@ cp "$_assets/vhosts/index.php" /var/www/"$_domain"/app/public_html/
 sed -i -r "s/DOMAIN\.LTD/$_domain/g" /var/www/"$_domain"/app/public_html/index.php
 
 #set proper right to user will handle the app
-chown -R root:admin  /var/www/"$_domain"/
-chmod -R g+w /var/www/"$_domain"/
-chmod -R g+r /var/www/"$_domain"/
-
-
+chown -R www:www  /var/www/"$_domain"/
+# chmod -R g+w /var/www/"$_domain"/
+# chmod -R g+r /var/www/"$_domain"/
 
 # create a shortcut to the site
 echo -n "Should we install a shortcut for a user? [Y|n] "
@@ -130,16 +128,19 @@ if [ "$yn" = "Y" ] || [ "$yn" = "y" ]; then
   echo -e "installing shortcut for '$user'";
 
   mkdir /home/"$user"/www/
-  chown "$user":admin /home/"$user"/www/
+  chown "$user":"$user" /home/"$user"/www/
   ln -s /var/www/"$_domain" /home/"$user"/www/"$_domain"
-  chown "$user":admin /home/"$user"/www/"$_domain"
-
+  chown "$user":"$user" /home/"$user"/www/"$_domain"
+  chown -R www:"$user" /home/"$user"/www/"$_domain"/app
+  chmod -R g+rw /home/"$user"/www/"$_domain"/app
 else
   echo -e 'no shortcut installed'
 fi
 # activate the vhost
 # ln -s /etc/nginx/sites-available/"$_domain".conf /etc/nginx/sites-enabled/"$_domain".conf
 
+nginx -t
+
 # restart nginx
 service nginx start
 echo -e "vhost $_domain configured"