Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Z
zkci-bitrix
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Карнаухов Константин
zkci-bitrix
Commits
9a2ebb38
Commit
9a2ebb38
authored
Mar 25, 2017
by
Карнаухов Константин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(docker): flip bx and site ports
site on 80 port now
parent
fd733f37
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
12 deletions
+4
-12
docker-compose.yml
docker-compose.yml
+2
-2
bitrix.conf
docker/apache/bitrix.conf
+0
-1
site.conf
docker/apache/site.conf
+0
-1
bitrix.conf
docker/nginx/bitrix.conf
+1
-4
site.conf
docker/nginx/site.conf
+1
-4
No files found.
docker-compose.yml
View file @
9a2ebb38
...
...
@@ -18,8 +18,8 @@ services:
-
./docker/apache/site.conf:/etc/httpd/bx/conf/site.conf:ro
-
./docker/nginx/site.conf:/etc/nginx/bx/site_enabled/site.conf:ro
ports
:
-
"
${BITRIX_PORT}:80"
-
"
${SITE_PORT}:80
80
"
-
"
${BITRIX_PORT}:80
80
"
-
"
${SITE_PORT}:80"
-
"
22"
environment
:
-
HOME=/home/bitrix
...
...
docker/apache/bitrix.conf
View file @
9a2ebb38
Listen
127
.
0
.
0
.
1
:
8888
<
VirtualHost
127
.
0
.
0
.
1
:
8888
>
#ServerAdmin webmaster@localhost
DocumentRoot
/
home
/
bitrix
/
www
<
Directory
/>
...
...
docker/apache/site.conf
View file @
9a2ebb38
Listen
127
.
0
.
0
.
1
:
8887
<
VirtualHost
127
.
0
.
0
.
1
:
8887
>
#ServerAdmin webmaster@localhost
DocumentRoot
/
home
/
bitrix
/
site
<
Directory
/>
...
...
docker/nginx/bitrix.conf
View file @
9a2ebb38
# Default website
server
{
listen
80
;
# server_name _;
# server_name_in_redirect off;
listen
8080
;
proxy_set_header
X
-
Real
-
IP
$
remote_addr
;
proxy_set_header
X
-
Forwarded
-
For
$
proxy_add_x_forwarded_for
;
...
...
docker/nginx/site.conf
View file @
9a2ebb38
# Default website
server
{
listen
8080
;
# server_name _;
# server_name_in_redirect off;
listen
80
;
proxy_set_header
X
-
Real
-
IP
$
remote_addr
;
proxy_set_header
X
-
Forwarded
-
For
$
proxy_add_x_forwarded_for
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment