diff --git a/assets/vhosts/drupal-ssl.nginxconf b/assets/vhosts/drupal-ssl.nginxconf index fcbd1b9..a53fd32 100644 --- a/assets/vhosts/drupal-ssl.nginxconf +++ b/assets/vhosts/drupal-ssl.nginxconf @@ -12,7 +12,7 @@ server { server_name DOMAIN.LTD; - root /var/www/DOMAIN.LTD/app/public_html; + root /var/www/DOMAIN.LTD/app/web; #SSL Certificates ssl_protocols TLSv1 TLSv1.1 TLSv1.2; diff --git a/assets/vhosts/drupal.nginxconf b/assets/vhosts/drupal.nginxconf index 19d2f32..7b3430d 100644 --- a/assets/vhosts/drupal.nginxconf +++ b/assets/vhosts/drupal.nginxconf @@ -2,7 +2,7 @@ server { listen 80; server_name DOMAIN.LTD; - root /var/www/DOMAIN.LTD/app/public_html; + root /var/www/DOMAIN.LTD/app/web; charset utf-8; diff --git a/assets/vhosts/simple-phpfpm-ssl.nginxconf b/assets/vhosts/simple-phpfpm-ssl.nginxconf index 0789815..ea65456 100644 --- a/assets/vhosts/simple-phpfpm-ssl.nginxconf +++ b/assets/vhosts/simple-phpfpm-ssl.nginxconf @@ -12,7 +12,7 @@ server { server_name DOMAIN.LTD; - root /var/www/DOMAIN.LTD/app/public_html; + root /var/www/DOMAIN.LTD/app/web; index index.html index.php; charset utf-8; diff --git a/assets/vhosts/simple-phpfpm.nginxconf b/assets/vhosts/simple-phpfpm.nginxconf index e20c02b..41bc1da 100644 --- a/assets/vhosts/simple-phpfpm.nginxconf +++ b/assets/vhosts/simple-phpfpm.nginxconf @@ -2,7 +2,7 @@ server { listen 80; server_name DOMAIN.LTD; - root /var/www/DOMAIN.LTD/app/public_html; + root /var/www/DOMAIN.LTD/app/web; index index.html index.php; charset utf-8; diff --git a/bin/user.sh b/bin/user.sh index de0edfb..18d9b7b 100755 --- a/bin/user.sh +++ b/bin/user.sh @@ -40,6 +40,7 @@ adduser "$user" sed -i "s/$user:\/bin\/ash/$user:\/bin\/bash/g" /etc/passwd # TODO limiting su to the admin group +yn="reset" while [ "$yn" != "y" ] && [ "$yn" != "n" ] do echo -n "Should we allow $user to su? [y|n] " diff --git a/bin/vhost.sh b/bin/vhost.sh index 10a146a..93d8e1c 100755 --- a/bin/vhost.sh +++ b/bin/vhost.sh @@ -87,11 +87,11 @@ fi cp "$_assets/vhosts/$_conffile" /etc/nginx/conf.d/"$_domain".conf sed -i -r "s/DOMAIN\.LTD/$_domain/g" /etc/nginx/conf.d/"$_domain".conf -mkdir -p /var/www/"$_domain"/app/public_html +mkdir -p /var/www/"$_domain"/app/web mkdir /var/www/"$_domain"/log -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 +cp "$_assets/vhosts/index.php" /var/www/"$_domain"/app/web/ +sed -i -r "s/DOMAIN\.LTD/$_domain/g" /var/www/"$_domain"/app/web/index.php #set proper right to user will handle the app chown -R www:www /var/www/"$_domain"/