mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-21 22:04:00 -07:00
Merge 8d0e52bda2 into 2a91899846
This commit is contained in:
vadim s. sabinich
GitHub
commit
bfe70d9f80
5 changed files with 399 additions and 10 deletions
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
# info: add system ip address
|
||||
# options: IP NETMASK [INTERFACE] [USER] [IP_STATUS] [IP_NAME] [NAT_IP]
|
||||
# options: IP NETMASK [INTERFACE] [USER] [IP_STATUS] [DEFAULT_DOMAIN] [NAT_IP]
|
||||
#
|
||||
# The function adds ip address into a system. It also creates rc scripts. You
|
||||
# can specify ip name which will be used as root domain for temporary aliases.
|
||||
|
|
@ -34,7 +34,7 @@ source $VESTA/conf/vesta.conf
|
|||
# Verifications #
|
||||
#----------------------------------------------------------#
|
||||
|
||||
check_args '2' "$#" 'IP NETMASK [INTERFACE] [USER] [STATUS] [NAME] [NATED_IP]'
|
||||
check_args '2' "$#" 'IP NETMASK [INTERFACE] [USER] [STATUS] [DEFAULT_DOMAIN] [NATED_IP]'
|
||||
is_format_valid 'ip' 'netmask' 'interface' 'user' 'ip_status'
|
||||
is_ip_free
|
||||
is_object_valid 'user' 'USER' "$user"
|
||||
|
|
@ -90,7 +90,7 @@ date=$(echo "$time_n_date" |cut -f 2 -d \ )
|
|||
# Adding vesta ip
|
||||
echo "OWNER='$user'
|
||||
STATUS='$ip_status'
|
||||
NAME='$ip_name'
|
||||
DEFAULT_DOMAIN='$ip_name'
|
||||
U_SYS_USERS=''
|
||||
U_WEB_DOMAINS='0'
|
||||
INTERFACE='$interface'
|
||||
|
|
@ -98,6 +98,7 @@ NETMASK='$netmask'
|
|||
NAT='$nat_ip'
|
||||
TIME='$time'
|
||||
DATE='$date'" > $VESTA/data/ips/$ip
|
||||
HOSTNAME=`hostname`
|
||||
chmod 660 $VESTA/data/ips/$ip
|
||||
|
||||
# WEB support
|
||||
|
|
@ -106,17 +107,21 @@ if [ ! -z "$WEB_SYSTEM" ]; then
|
|||
rm -f $web_conf
|
||||
|
||||
if [ "$WEB_SYSTEM" = 'httpd' ] || [ "$WEB_SYSTEM" = 'apache2' ]; then
|
||||
if [ -z "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then
|
||||
echo "NameVirtualHost $ip:$WEB_PORT" > $web_conf
|
||||
if [ -z "$(grep -r "Listen 127.0.0.1:$WEB_PORT" /etc/httpd/conf.d/* )" ]; then
|
||||
if [ -z "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then
|
||||
echo "NameVirtualHost $ip:$WEB_PORT" > $web_conf
|
||||
fi
|
||||
echo "Listen 127.0.0.1:$WEB_PORT" >> $web_conf
|
||||
fi
|
||||
echo "Listen $ip:$WEB_PORT" >> $web_conf
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$WEB_SSL" = 'mod_ssl' ]; then
|
||||
if [ -z "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then
|
||||
echo "NameVirtualHost $ip:$WEB_SSL_PORT" >> $web_conf
|
||||
if [ -z "$(grep -r "Listen 127.0.0.1:$WEB_PORT" /etc/httpd/conf.d/* )" ]; then
|
||||
if [ -z "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then
|
||||
echo "NameVirtualHost $ip:$WEB_SSL_PORT" >> $web_conf
|
||||
fi
|
||||
echo "Listen 127.0.0.1:$WEB_SSL_PORT" >> $web_conf
|
||||
fi
|
||||
echo "Listen $ip:$WEB_SSL_PORT" >> $web_conf
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -126,6 +131,7 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
|
|||
sed -e "s/%ip%/$ip/g" \
|
||||
-e "s/%web_port%/$WEB_PORT/g" \
|
||||
-e "s/%proxy_port%/$PROXY_PORT/g" \
|
||||
-e "s/%hostname%/$HOSTNAME/g" \
|
||||
> /etc/$PROXY_SYSTEM/conf.d/$ip.conf
|
||||
|
||||
# mod_extract_forwarded
|
||||
|
|
|
|||
90
install/rhel/7/templates/web/nginx/php-fpm/webasyst.sh
Normal file
90
install/rhel/7/templates/web/nginx/php-fpm/webasyst.sh
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
#!/bin/bash
|
||||
user="$1"
|
||||
domain="$2"
|
||||
ip="$3"
|
||||
home_dir="$4"
|
||||
docroot="$5"
|
||||
pool_conf="
|
||||
[$2]
|
||||
listen = /run/php7.4-fpm-$2.sock
|
||||
listen.owner = $1
|
||||
listen.group = nginx
|
||||
listen.mode = 0660
|
||||
|
||||
user = $1
|
||||
group = $1
|
||||
|
||||
pm = ondemand
|
||||
pm.max_children = 4
|
||||
pm.max_requests = 4000
|
||||
pm.process_idle_timeout = 10s
|
||||
pm.status_path = /status
|
||||
|
||||
php_admin_value[upload_tmp_dir] = /home/$1/tmp
|
||||
php_admin_value[session.save_path] = /home/$1/tmp
|
||||
php_admin_value[open_basedir] = /home/$1/.composer:/home/$1/web/$2/public_html:/home/$1/web/$2/private:/home/$1/web/$2/public_shtml:/home/$1/tmp:/tmp:/var/www/html:/bin:/usr/bin:/usr/local/bin:/usr/share:/opt
|
||||
php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f $1@$2
|
||||
|
||||
env[PATH] = /usr/local/bin:/usr/bin:/bin
|
||||
env[TMP] = /home/$1/tmp
|
||||
env[TMPDIR] = /home/$1/tmp
|
||||
env[TEMP] = /home/$1/tmp
|
||||
"
|
||||
|
||||
fastcgi_param="
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||
|
||||
fastcgi_param QUERY_STRING $query_string;
|
||||
fastcgi_param REQUEST_METHOD $request_method;
|
||||
fastcgi_param CONTENT_TYPE $content_type;
|
||||
fastcgi_param CONTENT_LENGTH $content_length;
|
||||
|
||||
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
|
||||
fastcgi_param REQUEST_URI $request_uri;
|
||||
fastcgi_param DOCUMENT_URI $document_uri;
|
||||
fastcgi_param DOCUMENT_ROOT $document_root;
|
||||
fastcgi_param SERVER_PROTOCOL $server_protocol;
|
||||
fastcgi_param REQUEST_SCHEME $scheme;
|
||||
fastcgi_param HTTPS $https if_not_empty;
|
||||
|
||||
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
|
||||
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
|
||||
|
||||
fastcgi_param REMOTE_ADDR $remote_addr;
|
||||
fastcgi_param REMOTE_PORT $remote_port;
|
||||
fastcgi_param SERVER_ADDR $server_addr;
|
||||
fastcgi_param SERVER_PORT $server_port;
|
||||
fastcgi_param SERVER_NAME $server_name;
|
||||
|
||||
# PHP only, required if PHP was built with --enable-force-cgi-redirect
|
||||
fastcgi_param REDIRECT_STATUS 200;"
|
||||
|
||||
pool_file_74="/etc/opt/remi/php74/php-fpm.d/$2.conf"
|
||||
|
||||
# если репозиторий remi есть, то устанавливаем php73-php-fpm, иначе - выход
|
||||
if [ -f /etc/yum.repos.d/remi-php74.repo ] ; then
|
||||
yum install php74-php-fpm php74-php-mbstring php74-php-curl php74-php-gd php74-php-zlib php74-php-gettext
|
||||
else
|
||||
echo "check this https://blog.remirepo.net/post/2019/12/03/Install-PHP-7.4-on-CentOS-RHEL-or-Fedora"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ -f "/etc/opt/remi/php74/php-fpm.d/www.conf" ]; then
|
||||
rm -f /etc/opt/remi/php74/php-fpm.d/www.conf
|
||||
fi
|
||||
|
||||
find /etc/opt/remi/*/php-fpm.d/ -type f -name "$2.conf" -delete
|
||||
echo "$fastcgi_param" > /etc/nginx/wa-fastcgi_params
|
||||
|
||||
if [ -f "$pool_file_74" ]; then
|
||||
rm -f $pool_file_74
|
||||
echo "$pool_conf" > $pool_file_74
|
||||
systemctl restart php74-php-fpm
|
||||
|
||||
else
|
||||
echo "$pool_conf" > $pool_file_74
|
||||
systemctl restart php74-php-fpm
|
||||
fi
|
||||
|
||||
exit 0
|
||||
148
install/rhel/7/templates/web/nginx/php-fpm/webasyst.stpl
Normal file
148
install/rhel/7/templates/web/nginx/php-fpm/webasyst.stpl
Normal file
|
|
@ -0,0 +1,148 @@
|
|||
server {
|
||||
|
||||
listen %ip%:%web_ssl_port% ssl http2;
|
||||
server_name %domain_idn% %alias_idn%;
|
||||
|
||||
ssl_certificate %ssl_pem%;
|
||||
ssl_certificate_key %ssl_key%;
|
||||
|
||||
ssl_stapling on;
|
||||
ssl_stapling_verify on;
|
||||
|
||||
ssl_buffer_size 4k;
|
||||
|
||||
ssl_session_timeout 4h;
|
||||
|
||||
root %docroot%;
|
||||
index index.php index.html index.htm;
|
||||
access_log /var/log/nginx/domains/%domain%.log combined;
|
||||
access_log /var/log/nginx/domains/%domain%.bytes bytes;
|
||||
error_log /var/log/nginx/domains/%domain%.error.log error;
|
||||
|
||||
try_files $uri $uri/ /index.php?$query_string;
|
||||
|
||||
location /index.php {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
}
|
||||
|
||||
# for install only
|
||||
location /install.php {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
}
|
||||
|
||||
location /api.php {
|
||||
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
}
|
||||
|
||||
location ~ /(oauth.php|link.php|payments.php) {
|
||||
try_files $uri $uri/ /index.php?$query_string;
|
||||
}
|
||||
|
||||
location ^~ /wa-data/protected/ {
|
||||
internal;
|
||||
}
|
||||
|
||||
location ~ /wa-content {
|
||||
allow all;
|
||||
}
|
||||
|
||||
location ^~ /(wa-apps|wa-plugins|wa-system|wa-widgets)/.*/(lib|locale|templates)/ {
|
||||
deny all;
|
||||
}
|
||||
|
||||
location ~* ^/wa-(cache|config|installer|log|system)/ {
|
||||
return 403;
|
||||
}
|
||||
|
||||
location ~* ^/wa-data/public/contacts/photos/[0-9]+/ {
|
||||
root %docroot%;
|
||||
access_log off;
|
||||
expires 30d;
|
||||
error_page 404 = @contacts_thumb;
|
||||
}
|
||||
|
||||
location @contacts_thumb {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
fastcgi_param SCRIPT_NAME /wa-data/public/contacts/photos/thumb.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root/wa-data/public/contacts/photos/thumb.php;
|
||||
}
|
||||
|
||||
# photos app
|
||||
location ~* ^/wa-data/public/photos/[0-9]+/ {
|
||||
access_log off;
|
||||
expires 30d;
|
||||
error_page 404 = @photos_thumb;
|
||||
}
|
||||
|
||||
location @photos_thumb {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
fastcgi_param SCRIPT_NAME /wa-data/public/photos/thumb.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root/wa-data/public/photos/thumb.php;
|
||||
}
|
||||
# end photos app
|
||||
|
||||
# shop app
|
||||
location ~* ^/wa-data/public/shop/products/[0-9]+/ {
|
||||
access_log off;
|
||||
expires 30d;
|
||||
error_page 404 = @shop_thumb;
|
||||
}
|
||||
location @shop_thumb {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
fastcgi_param SCRIPT_NAME /wa-data/public/shop/products/thumb.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root/wa-data/public/shop/products/thumb.php;
|
||||
}
|
||||
|
||||
location ~* ^/wa-data/public/shop/promos/[0-9]+ {
|
||||
access_log off;
|
||||
expires 30d;
|
||||
error_page 404 = @shop_promo;
|
||||
}
|
||||
location @shop_promo {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
fastcgi_param SCRIPT_NAME /wa-data/public/shop/promos/thumb.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root/wa-data/public/shop/promos/thumb.php;
|
||||
}
|
||||
# end shop app
|
||||
|
||||
# mailer app
|
||||
location ~* ^/wa-data/public/mailer/files/[0-9]+/ {
|
||||
access_log off;
|
||||
error_page 404 = @mailer_file;
|
||||
}
|
||||
location @mailer_file {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
fastcgi_param SCRIPT_NAME /wa-data/public/mailer/files/file.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root/wa-data/public/mailer/files/file.php;
|
||||
}
|
||||
# end mailer app
|
||||
|
||||
location ~* ^.+\.(%proxy_extentions%)$ {
|
||||
access_log off;
|
||||
expires 30d;
|
||||
}
|
||||
|
||||
location /error/ {
|
||||
alias %home%/%user%/web/%domain%/document_errors/;
|
||||
}
|
||||
|
||||
location /vstats/ {
|
||||
alias %home%/%user%/web/%domain%/stats/;
|
||||
include %home%/%user%/conf/web/%domain%.auth*;
|
||||
}
|
||||
|
||||
include /etc/nginx/conf.d/phpmyadmin.inc*;
|
||||
include /etc/nginx/conf.d/phppgadmin.inc*;
|
||||
include /etc/nginx/conf.d/webmail.inc*;
|
||||
|
||||
include %home%/%user%/conf/web/nginx.%domain%.conf*;
|
||||
}
|
||||
137
install/rhel/7/templates/web/nginx/php-fpm/webasyst.tpl
Normal file
137
install/rhel/7/templates/web/nginx/php-fpm/webasyst.tpl
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
server {
|
||||
|
||||
listen %ip%:%proxy_port%;
|
||||
server_name %domain_idn% %alias_idn%;
|
||||
root %docroot%;
|
||||
index index.php index.html index.htm;
|
||||
access_log /var/log/nginx/domains/%domain%.log combined;
|
||||
access_log /var/log/nginx/domains/%domain%.bytes bytes;
|
||||
error_log /var/log/nginx/domains/%domain%.error.log error;
|
||||
|
||||
try_files $uri $uri/ /index.php?$query_string;
|
||||
|
||||
location /index.php {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
}
|
||||
|
||||
# for install only
|
||||
location /install.php {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
}
|
||||
|
||||
location /api.php {
|
||||
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
}
|
||||
|
||||
location ~ /(oauth.php|link.php|payments.php) {
|
||||
try_files $uri $uri/ /index.php?$query_string;
|
||||
}
|
||||
|
||||
location ^~ /wa-data/protected/ {
|
||||
internal;
|
||||
}
|
||||
|
||||
location ~ /wa-content {
|
||||
allow all;
|
||||
}
|
||||
|
||||
location ^~ /(wa-apps|wa-plugins|wa-system|wa-widgets)/.*/(lib|locale|templates)/ {
|
||||
deny all;
|
||||
}
|
||||
|
||||
location ~* ^/wa-(cache|config|installer|log|system)/ {
|
||||
return 403;
|
||||
}
|
||||
|
||||
location ~* ^/wa-data/public/contacts/photos/[0-9]+/ {
|
||||
root %docroot%;
|
||||
access_log off;
|
||||
expires 30d;
|
||||
error_page 404 = @contacts_thumb;
|
||||
}
|
||||
|
||||
location @contacts_thumb {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
fastcgi_param SCRIPT_NAME /wa-data/public/contacts/photos/thumb.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root/wa-data/public/contacts/photos/thumb.php;
|
||||
}
|
||||
|
||||
# photos app
|
||||
location ~* ^/wa-data/public/photos/[0-9]+/ {
|
||||
access_log off;
|
||||
expires 30d;
|
||||
error_page 404 = @photos_thumb;
|
||||
}
|
||||
|
||||
location @photos_thumb {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
fastcgi_param SCRIPT_NAME /wa-data/public/photos/thumb.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root/wa-data/public/photos/thumb.php;
|
||||
}
|
||||
# end photos app
|
||||
|
||||
# shop app
|
||||
location ~* ^/wa-data/public/shop/products/[0-9]+/ {
|
||||
access_log off;
|
||||
expires 30d;
|
||||
error_page 404 = @shop_thumb;
|
||||
}
|
||||
location @shop_thumb {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
fastcgi_param SCRIPT_NAME /wa-data/public/shop/products/thumb.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root/wa-data/public/shop/products/thumb.php;
|
||||
}
|
||||
|
||||
location ~* ^/wa-data/public/shop/promos/[0-9]+ {
|
||||
access_log off;
|
||||
expires 30d;
|
||||
error_page 404 = @shop_promo;
|
||||
}
|
||||
location @shop_promo {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
fastcgi_param SCRIPT_NAME /wa-data/public/shop/promos/thumb.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root/wa-data/public/shop/promos/thumb.php;
|
||||
}
|
||||
# end shop app
|
||||
|
||||
# mailer app
|
||||
location ~* ^/wa-data/public/mailer/files/[0-9]+/ {
|
||||
access_log off;
|
||||
error_page 404 = @mailer_file;
|
||||
}
|
||||
location @mailer_file {
|
||||
include /etc/nginx/wa-fastcgi_params;
|
||||
fastcgi_pass unix:/run/php7.4-fpm-%domain_idn%.sock;
|
||||
fastcgi_param SCRIPT_NAME /wa-data/public/mailer/files/file.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root/wa-data/public/mailer/files/file.php;
|
||||
}
|
||||
# end mailer app
|
||||
|
||||
location ~* ^.+\.(%proxy_extentions%)$ {
|
||||
access_log off;
|
||||
expires 30d;
|
||||
}
|
||||
|
||||
location /error/ {
|
||||
alias %home%/%user%/web/%domain%/document_errors/;
|
||||
}
|
||||
|
||||
location /vstats/ {
|
||||
alias %home%/%user%/web/%domain%/stats/;
|
||||
include %home%/%user%/conf/web/%domain%.auth*;
|
||||
}
|
||||
|
||||
include /etc/nginx/conf.d/phpmyadmin.inc*;
|
||||
include /etc/nginx/conf.d/phppgadmin.inc*;
|
||||
include /etc/nginx/conf.d/webmail.inc*;
|
||||
|
||||
include %home%/%user%/conf/web/nginx.%domain%.conf*;
|
||||
}
|
||||
|
|
@ -340,3 +340,11 @@ function is_it_mysql_or_mariadb() {
|
|||
if (isset($data['mariadb'])) $mysqltype='mariadb';
|
||||
return $mysqltype;
|
||||
}
|
||||
|
||||
function check_dns_installed() {
|
||||
exec (VESTA_CMD."v-list-sys-dns-status", $output, $return_var);
|
||||
unset($output);
|
||||
$dns_enabled='on';
|
||||
if (isset($date['dns'])) $dns_enabled='off' ;
|
||||
return $dns_enabled;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue