rabin 4 years ago
parent
commit
368ced75e9

+ 2 - 2
container/conf/web/nginx/conf.d/domain.conf

@@ -1,5 +1,5 @@
 server {
-    server_name me.5dev.cn;
+    server_name me.5dev.cn jiaoyou.qizhixiong.com;
     listen 80;
     
     autoindex on;
@@ -8,7 +8,7 @@ server {
 
     charset $charset;
 
-    set $rootdir /www/jy/public;
+    set $rootdir /www/jiaoyou20190507/public;
     root $rootdir;
     index index.php index.html;
 

+ 2 - 2
container/conf/web/nginx/conf.d/site.conf

@@ -65,8 +65,8 @@ server {
         # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini (No settings!)
 
         # With php-cgi alone:
-        fastcgi_pass web-php7_swoole:9000;
-        #fastcgi_pass web-php7:9000;
+        #fastcgi_pass web-php7_swoole:9000;
+        fastcgi_pass web-php7:9000;
         #fastcgi_pass web-php5:9000;
         # With php-fpm:
         #fastcgi_pass unix:/var/run/php7-fpm.sock;

File diff suppressed because it is too large
+ 105 - 1
container/web/index.html


+ 6 - 6
install

@@ -40,12 +40,12 @@ fi
 #pip install python-daemon
 #pip install redis
 
-yumstatus=`check yum`
-if [ "$yumstatus" = 0 ]; then
-	apt install python-gevent
-else
-	yum install python-gevent
-fi
+#yumstatus=`check yum`
+#if [ "$yumstatus" = 0 ]; then
+	#apt install python-gevent
+#else
+	#yum install python-gevent
+#fi
 #dm run server-redis
 #python $basepath/src/daemon.py &
 

+ 1 - 1
src/docker/conf/web.conf

@@ -12,7 +12,7 @@ alias = mysql
 #使用mariadb来代替mysql
 image = mariadb
 #port = 3310:3306
-volumes = {container}conf/db/mariadb:/etc/mysql,/data/mariadb/{name}/data:/var/lib/mysql
+volumes = {container}conf/db/mariadb:/etc/mysql,/mariadb/{name}/data:/var/lib/mysql
 environment = MYSQL_ROOT_PASSWORD=123456
 alias = mysql
 

Some files were not shown because too many files changed in this diff