Форум

Добрый день! Переносим портал bitrix.olddomain.ru на новый домен вида bitrix.newdomain.com. В настройках сайта прописали новые url, теперь правим настройки nginx. Столкнулись с такой проблемой: портал работает на новом домене, но редиректа как такового со старого нет - т.е. портал доступен и по старому домену, и по новому. Нужно, чтобы всё редиректилось, независимо от протокола http/https, на новый домен. Если делаю rewrite для http и https отдельно, то браузеры выдают ошибку о циклической переадресации. return 301/302 тоже не помогает. Пожалуйста, помогите :)
Вот конфиг ssl.s1.conf:

Скрытый текст

[COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]# Default SSL certificate enabled website[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]server {[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]listen 80;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]server_name bitrix.olddomain.ru;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]rewrite ^ [/SIZE][/FONT][/COLOR][URL=https://bitrix.newdomain.com$request_uri]https://bitrix.newdomain.com$request_uri[/URL][COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px];[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]}[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]server {[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]listen 443 ssl http2;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]server_name bitrix.newdomain.com;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]# Enable SSL connection[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]include bx/conf/ssl.conf;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]server_name_in_redirect off;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]proxy_set_header X-Real-IP $remote_addr;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]proxy_set_header Host $host:443;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]proxy_set_header HTTPS YES;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]set $proxyserver "[/SIZE][/FONT][/COLOR][URL=http://127.0.0.1:8888/]127.0.0.1:8888[/URL][COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]";[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]set $docroot "/home/bitrix/www";[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]index index.php;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]root /home/bitrix/www;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]# custom options for sites; doesn't changes on update[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]include bx/site_settings/default/*.conf;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]# Include parameters common to all websites[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]include bx/conf/bitrix.conf;[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]# Include server monitoring API's[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=15px]include bx/server_monitor.conf; [/SIZE][/FONT][/COLOR]

А вот конфиг s1.conf:

Скрытый текст

# Default website server { listen 80; server_name bitrix.olddomain.ru; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host:80; set $proxyserver "[URL=http://127.0.0.1:8888/]127.0.0.1:8888[/URL]"; set $docroot "/home/bitrix/www"; index index.php; root /home/bitrix/www; # Redirect to ssl if need if (-f /home/bitrix/www/.htsecure) { rewrite ^(.*)$ [URL=https://$host$1]https://$host$1[/URL] permanent; } # custom options for sites; doesn't changes on update include bx/site_settings/default/*.conf; # Include parameters common to all websites include bx/conf/bitrix.conf; # Include server monitoring locations include bx/server_monitor.conf; }

А вот конфиг .htaccess

Скрытый текст

[COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=14px]Options +FollowSymLinks[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=14px]RewriteEngine On[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=14px]RewriteCond %{REQUEST_FILENAME} !-f[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=14px]RewriteCond %{REQUEST_FILENAME} !-l[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=14px]RewriteCond %{REQUEST_FILENAME} !-d[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=14px]RewriteCond %{REQUEST_FILENAME} !/bitrix/urlrewrite.php$[/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=14px]RewriteRule ^(.*)$ /bitrix/urlrewrite.php [L][/SIZE][/FONT][/COLOR] [COLOR=#333333][FONT="PT Sans", Helvetica, Arial, sans-serif][SIZE=14px]RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization}] [/SIZE][/FONT][/COLOR]