Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
workspace
Overview
Overview
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
devops
workspace
Commits
65893741
Commit
65893741
authored
Sep 17, 2021
by
maxingyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
first
parent
cd9308bc
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
98 additions
and
144 deletions
+98
-144
.gitignore
.gitignore
+2
-4
c9.conf
c9.conf
+0
-13
dnsmasq.conf
config/dns/dnsmasq.conf
+0
-0
html.conf
config/nginx/html.conf
+33
-54
php.conf
config/nginx/php.conf
+9
-9
.gitkeep
config/ssh/.gitkeep
+0
-0
docker-compose.yml
docker-compose.yml
+51
-32
.gitignore
logs/.gitignore
+3
-0
my.cnf
my.cnf
+0
-32
.gitkeep
web/.gitkeep
+0
-0
No files found.
.gitignore
View file @
65893741
...
@@ -2,12 +2,10 @@ storage/mysql/*
...
@@ -2,12 +2,10 @@ storage/mysql/*
storage/redis/*
storage/redis/*
!storage/mysql/.gitkeep
!storage/mysql/.gitkeep
!storage/redis/.gitkeep
!storage/redis/.gitkeep
vue/*
!vue/.gitkeep
laravel/*
laravel/*
!laravel/.gitkeep
!laravel/.gitkeep
gulp
/*
web
/*
!
gulp
/.gitkeep
!
web
/.gitkeep
.c9/
.c9/
.idea/
.idea/
id_rsa
id_rsa
...
...
c9.conf
deleted
100644 → 0
View file @
cd9308bc
server
{
listen
80
;
server_name
c9
.
test
;
access_log
off
;
location
/ {
proxy_pass
http
://
localhost
:
8181
/;
proxy_set_header
Host
$
host
;
proxy_set_header
X
-
Real
-
IP
$
remote_addr
;
proxy_set_header
X
-
Forwarded
-
For
$
proxy_add_x_forwarded_for
;
}
}
dns/dnsmasq.conf
→
config/
dns/dnsmasq.conf
View file @
65893741
File moved
html.conf
→
config/nginx/
html.conf
View file @
65893741
#promotion vue:npm run dev
server
{
server
{
listen
80
;
listen
80
;
server_name
piston
.
test
;
server_name
piston
.
test
;
root
/
web
/
piston
/
dist
;
location
/ {
proxy_pass
http
://
localhost
:
3000
/;
}
}
server
{
listen
80
;
server_name
piston
.
build
.
test
;
root
/
workspace
/
gulp
/
piston
/
dist
;
index
index
.
html
index
.
htm
index
.
php
;
index
index
.
html
index
.
htm
index
.
php
;
...
@@ -38,11 +31,11 @@ server {
...
@@ -38,11 +31,11 @@ server {
location
~ \.
php
$ {
location
~ \.
php
$ {
fastcgi_split_path_info
^(.+\.
php
)(/.+)$;
fastcgi_split_path_info
^(.+\.
php
)(/.+)$;
fastcgi_pass
unix
:/
var
/
run
/
php
/
php5
.
6
-
fpm
.
sock
;
fastcgi_pass
php56
:
9000
;
fastcgi_index
index
.
php
;
fastcgi_index
index
.
php
;
include
fastcgi_params
;
fastcgi_param
SCRIPT_FILENAME
/
topka
/
public
/$
fastcgi_script_name
;
include
fastcgi_params
;
}
}
location
~ /\.
ht
{
location
~ /\.
ht
{
deny
all
;
deny
all
;
}
}
...
@@ -50,7 +43,7 @@ server {
...
@@ -50,7 +43,7 @@ server {
server
{
server
{
listen
80
;
listen
80
;
server_name
vue
.
dealer
.
test
;
server_name
vue
.
dealer
.
test
;
root
/
w
orkspace
/
vue
/
dealer
/
dist
;
root
/
w
eb
/
dealer
/
dist
;
index
index
.
html
;
index
index
.
html
;
...
@@ -96,8 +89,8 @@ server {
...
@@ -96,8 +89,8 @@ server {
listen
80
;
listen
80
;
listen
443
;
listen
443
;
server_name
layui
.
test
;
server_name
layui
.
test
;
root
/
w
orkspace
/
vue
/
layui
-
agent
/
start
;
root
/
w
eb
/
layui
-
agent
/
start
;
#root /data/git/piston/dist;
index
index
.
html
index
.
htm
;
index
index
.
html
index
.
htm
;
access_log
/
var
/
log
/
nginx
/
layui
-
agent
.
access
.
log
;
access_log
/
var
/
log
/
nginx
/
layui
-
agent
.
access
.
log
;
...
@@ -111,11 +104,11 @@ server {
...
@@ -111,11 +104,11 @@ server {
location
/
src
/ {
location
/
src
/ {
alias
/
w
orkspace
/
vue
/
layui
-
agent
/
src
/;
alias
/
w
eb
/
layui
-
agent
/
src
/;
}
}
location
/
dist
/ {
location
/
dist
/ {
alias
/
w
orkspace
/
vue
/
layui
-
agent
/
dist
/;
alias
/
w
eb
/
layui
-
agent
/
dist
/;
}
}
location
/
master
/ {
location
/
master
/ {
...
@@ -124,47 +117,32 @@ server {
...
@@ -124,47 +117,32 @@ server {
}
}
server
{
server
{
listen
80
;
listen
80
;
server_name
promotion
.
build
.
test
;
listen
443
;
root
/
workspace
/
vue
/
promotion
/
dist
;
server_name
provider
.
test
;
index
index
.
html
;
root
/
web
/
layui
-
provider
/
start
;
access_log
/
var
/
log
/
nginx
/
promotion
.
build
.
access
.
log
;
error_log
/
var
/
log
/
nginx
/
promotion
.
build
.
error
.
log
;
location
/ {
try_files
$
uri
/
index
.
html
?$
query_string
;
}
}
index
index
.
html
index
.
htm
;
server
{
access_log
/
var
/
log
/
nginx
/
layui
-
agent
.
access
.
log
;
listen
80
;
error_log
/
var
/
log
/
nginx
/
layui
-
agent
.
error
.
log
;
listen
443
;
server_name
provider
.
test
;
root
/
workspace
/
vue
/
layui
-
provider
/
start
;
#root /data/git/piston/dist;
index
index
.
html
index
.
htm
;
access_log
/
var
/
log
/
nginx
/
layui
-
agent
.
access
.
log
;
location
~* ^/(?!
dist
).+.(
jpg
|
jpeg
|
gif
|
png
) {
error_log
/
var
/
log
/
nginx
/
layui
-
agent
.
error
.
log
;
if
(!-
e
$
request_filename
) {
proxy_pass
http
://
sosocar
.
test
;
location
~* ^/(?!
dist
).+.(
jpg
|
jpeg
|
gif
|
png
) {
}
if
(!-
e
$
request_filename
) {
}
proxy_pass
http
://
sosocar
.
test
;
}
}
location
/
src
/ {
location
/
src
/ {
alias
/
workspace
/
vue
/
layui
-
provider
/
src
/;
alias
/
web
/
layui
-
provider
/
src
/;
}
}
location
/
dist
/ {
location
/
dist
/ {
alias
/
workspace
/
vue
/
layui
-
provider
/
dist
/;
alias
/
web
/
layui
-
provider
/
dist
/;
}
}
location
/
provider
/ {
location
/
provider
/ {
proxy_pass
http
://
sosocar
.
test
;
proxy_pass
http
://
sosocar
.
test
;
}
}
}
}
\ No newline at end of file
php.conf
→
config/nginx/
php.conf
View file @
65893741
server
{
server
{
listen
80
;
listen
80
;
server_name
dealer
.
test
;
server_name
dealer
.
test
;
root
/
workspace
/
laravel
/
dealer
/
public
;
add_header
X
-
Frame
-
Options
"SAMEORIGIN"
;
add_header
X
-
Frame
-
Options
"SAMEORIGIN"
;
add_header
X
-
Content
-
Type
-
Options
"nosniff"
;
add_header
X
-
Content
-
Type
-
Options
"nosniff"
;
...
@@ -20,8 +19,8 @@ server {
...
@@ -20,8 +19,8 @@ server {
error_page
404
/
index
.
php
;
error_page
404
/
index
.
php
;
location
~ \.
php
$ {
location
~ \.
php
$ {
fastcgi_pass
unix
:/
var
/
run
/
php
/
php7
.
1
-
fpm
.
sock
;
fastcgi_pass
php71
:
9000
;
fastcgi_param
SCRIPT_FILENAME
$
realpath_root
$
fastcgi_script_name
;
fastcgi_param
SCRIPT_FILENAME
/
dealer
/
public
/
$
fastcgi_script_name
;
include
fastcgi_params
;
include
fastcgi_params
;
}
}
...
@@ -33,7 +32,8 @@ server {
...
@@ -33,7 +32,8 @@ server {
server
{
server
{
listen
80
;
listen
80
;
server_name
promotion
.
test
;
server_name
promotion
.
test
;
root
/
workspace
/
laravel
/
promotion
/
public
;
root
/
laravel
/
promotion
/
public
;
client_max_body_size
1024
m
;
add_header
X
-
Frame
-
Options
"SAMEORIGIN"
;
add_header
X
-
Frame
-
Options
"SAMEORIGIN"
;
add_header
X
-
Content
-
Type
-
Options
"nosniff"
;
add_header
X
-
Content
-
Type
-
Options
"nosniff"
;
...
@@ -52,8 +52,8 @@ server {
...
@@ -52,8 +52,8 @@ server {
error_page
404
/
index
.
php
;
error_page
404
/
index
.
php
;
location
~ \.
php
$ {
location
~ \.
php
$ {
fastcgi_pass
unix
:/
var
/
run
/
php
/
php7
.
1
-
fpm
.
sock
;
fastcgi_pass
php71
:
9000
;
fastcgi_param
SCRIPT_FILENAME
$
realpath_root
$
fastcgi_script_name
;
fastcgi_param
SCRIPT_FILENAME
/
promotion
/
public
/
$
fastcgi_script_name
;
include
fastcgi_params
;
include
fastcgi_params
;
}
}
...
@@ -66,7 +66,7 @@ server {
...
@@ -66,7 +66,7 @@ server {
listen
80
;
listen
80
;
keepalive_timeout
60
;
keepalive_timeout
60
;
server_name
sosocar
.
test
;
server_name
sosocar
.
test
;
root
/
workspace
/
laravel
/
topka
/
public
;
root
/
laravel
/
topka
/
public
;
location
/ {
location
/ {
if
(!-
e
$
request_filename
) {
if
(!-
e
$
request_filename
) {
...
@@ -89,9 +89,9 @@ server {
...
@@ -89,9 +89,9 @@ server {
proxy_pass
http
://
api
.
sosocar
.
cn
;
proxy_pass
http
://
api
.
sosocar
.
cn
;
}
}
location
~ \.
php
$ {
location
~ \.
php
$ {
fastcgi_pass
unix
:/
var
/
run
/
php
/
php5
.
6
-
fpm
.
sock
;
fastcgi_pass
php56
:
9000
;
fastcgi_index
index
.
php
;
fastcgi_index
index
.
php
;
fastcgi_param
SCRIPT_FILENAME
$
document_root
$
fastcgi_script_name
;
fastcgi_param
SCRIPT_FILENAME
/
topka
/
public
/
$
fastcgi_script_name
;
include
fastcgi_params
;
include
fastcgi_params
;
}
}
}
}
gulp
/.gitkeep
→
config/ssh
/.gitkeep
View file @
65893741
File moved
docker-compose.yml
View file @
65893741
...
@@ -2,58 +2,77 @@ version: '3.5'
...
@@ -2,58 +2,77 @@ version: '3.5'
services
:
services
:
workspace
:
nginx
:
container_name
:
workspace
image
:
nginx:alpine
image
:
cnice/4wheels-devops:1.0.4
restart
:
always
networks
:
volumes
:
-
wb_net
-
./config/nginx:/etc/nginx/conf.d
ports
:
-
./logs/nginx:/var/log/nginx
-
./web:/web
-
./laravel:/laravel
ports
:
-
80:80
-
80:80
-
443:443
php56
:
image
:
cnice/4wheels-php56:latest
restart
:
always
volumes
:
-
'
./laravel/topka:/topka'
hostname
:
local
links
:
-
dbm
-
dbr
-
memcached
-
beanstalkd
php71
:
image
:
cnice/4wheels-php71:latest
restart
:
always
volumes
:
volumes
:
-
'
.:/workspace'
-
'
./laravel/dealer:/dealer'
-
'
./laravel/promotion:/promotion'
hostname
:
local
hostname
:
local
links
:
-
dbm
-
dbr
-
memcached
-
beanstalkd
mysql.test
:
dbm
:
container_name
:
mysql
image
:
mysql:5.5
image
:
mysql:5.5
networks
:
restart
:
always
-
wb_net
environment
:
environment
:
MYSQL_ROOT_PASSWORD
:
root
MYSQL_ROOT_PASSWORD
:
topka2012
volumes
:
volumes
:
-
'
./storage/mysql:/var/lib/mysql'
-
'
./storage/mysql:/var/lib/mysql'
# - './my.cnf:/etc/mysql/my.cnf'
ports
:
ports
:
-
3306:3306
-
3306:3306
hostname
:
mysql
redis.test
:
dbr
:
container_name
:
redis
image
:
redis:alpine
image
:
redis:alpine
networks
:
-
wb_net
volumes
:
volumes
:
-
'
./storage/redis:/data'
-
'
./storage/redis:/data'
restart
:
always
ports
:
ports
:
-
6379:6379
-
6379:6379
command
:
redis-server --appendonly yes
command
:
redis-server --requirepass topka2012 --appendonly yes
hostname
:
redis
dns
:
dns
:
container_name
:
dns
image
:
jpillora/dnsmasq
image
:
jpillora/dnsmasq
networks
:
restart
:
always
-
wb_net
ports
:
ports
:
-
53:53/udp
-
53:53/udp
-
5380:8080
-
5380:8080
volumes
:
volumes
:
-
'
./dns/dnsmasq.conf:/etc/dnsmasq.conf'
-
'
./config/dns/dnsmasq.conf:/etc/dnsmasq.conf'
memcached
:
networks
:
image
:
memcached:alpine3.14
wb_net
:
restart
:
always
name
:
wb_net
ports
:
ipam
:
-
11211:11211
driver
:
default
beanstalkd
:
config
:
image
:
schickling/beanstalkd
-
subnet
:
"
172.29.233.0/24"
restart
:
always
ports
:
-
11300:11300
logs/.gitignore
0 → 100644
View file @
65893741
nginx/*
!nginx/.gitkeep
\ No newline at end of file
my.cnf
deleted
100644 → 0
View file @
cd9308bc
# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# The MySQL Server configuration file.
#
# For explanations see
# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
[mysqld]
pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock
datadir = /var/lib/mysql
secure-file-priv= NULL
default_authentication_plugin=mysql_native_password
# Custom config should go here
!includedir /etc/mysql/conf.d/
vue
/.gitkeep
→
web
/.gitkeep
View file @
65893741
File moved
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