Merge branch 'master' of ssh://git.dever.cc:10022/python/dm

container/conf/web/nginx/conf.d/domain.conf

@@ -8,54 +8,40 @@ server {
 
     charset $charset;
 
-    set $rootdir /www/jy/public;
+    set $rootdir /www/huala_v2/public;
     root $rootdir;
     index index.php index.html;
-
-    set $rewrite yes;
-
-    location ~ ^/favicon\.ico$ {
-        root $rootdir;
-    }
-    
-    location ~* (.*).tpl {
-        return 404;
-    }
-
-    if ( $request_uri ~* ^/(doc\/|public\/|upload\/|assets\/|static\/|crossdomain\.xml|index\.php|favicon\.ico) ) {
-        set $rewrite no;
+    if (!-d $request_filename){
+        set $rule_0 1$rule_0;
     }
-
-
-    if ($rewrite ~* yes) {
-        rewrite ^/(.*) /index.php/$1 last;
+    if (!-f $request_filename){
+        set $rule_0 2$rule_0;
     }
-
-    location ~ /(doc\/|upload\/|public\/|assets\/|static\/|crossdomain\.xml)
-    {
-        try_files $uri $uri/ /index.html;
+    if ($rule_0 = "21"){
+        rewrite ^/(.*)$ /index.php?s=$1 last;
     }
-
-    location /doc/ {
-		try_files $uri $uri/ /index.html;
+    location / {
+                # First attempt to serve request as file, then
+                # as directory, then fall back to displaying a 404.
+                try_files $uri $uri/ =404;
+                # Uncomment to enable naxsi on this location
+                # include /etc/nginx/naxsi.rules
     }
 
-    location ~ ^(.*)$ {
-        #add_header Access-Control-Allow-Origin http://192.168.0.109:8080;
-        #add_header Access-Control-Allow-Headers X-Requested-With;
-       # add_header Access-Control-Allow-Methods GET,POST,OPTIONS;
-        #add_header Access-Control-Allow-Credentials true;
+    #location ~ ^(.*)$ {
+    location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
+        # 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 onepage-php5:9000;
+        #fastcgi_pass web-php5:9000;
         # With php-fpm:
         #fastcgi_pass unix:/var/run/php7-fpm.sock;
         fastcgi_index index.php;
-        fastcgi_param  SCRIPT_FILENAME  $rootdir/index.php;
-        fastcgi_param  PATH_INFO $fastcgi_path_info;
+        fastcgi_param  SCRIPT_FILENAME  $rootdir/$fastcgi_script_name;
+        #fastcgi_param  PATH_INFO $fastcgi_path_info;
         include fastcgi_params;
     }
 }

container/conf/web/nginx/conf.d/site.conf

@@ -51,6 +51,9 @@ server {
     if ( $request_uri ~* /pay/pay/notify ) {
             rewrite ^/pay/pay/notify/([0-9+]) /pay/pay/index.php?l=api.notify&account_id=$1 last;
     }
+    if ( $request_uri ~* /public ) {
+            rewrite ^/(.*)/public/(.*) /$1/public/index.php?$2 last;
+    }
     location / {
                 # First attempt to serve request as file, then
                 # as directory, then fall back to displaying a 404.
@@ -65,8 +68,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;

container/conf/web/nginx/fastcgi_params

@@ -20,7 +20,7 @@ fastcgi_param  REMOTE_PORT        $remote_port;
 fastcgi_param  SERVER_ADDR        $server_addr;
 fastcgi_param  SERVER_PORT        $server_port;
 fastcgi_param  SERVER_NAME        $server_name;
-fastcgi_param  REDIRECT_URL       test;
+#fastcgi_param  REDIRECT_URL       test;
 
 # PHP only, required if PHP was built with --enable-force-cgi-redirect
 fastcgi_param  REDIRECT_STATUS    200;

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 &
 

src/docker/build/tool/walle/Dockerfile

@@ -0,0 +1,20 @@
+FROM docker.dever.cc/os/alpine:latest
+
+MAINTAINER Rabin "https://github.com/shemic"
+
+RUN apk add --no-cache --update nginx mysql-client python py-virtualenv && \
+	mkdir /run/nginx/ && \
+	rm -rf /etc/nginx/conf.d/default.conf && \
+	pip install virtualenv && \
+	pip install flask && \
+	git clone https://github.com/meolu/walle-web.git /walle-web && \
+	cd /walle-web && \
+	sh admin.sh init && \
+	virtualenv --no-site-packages -p python venv && \
+	sed -i "s/user:password@localhost:3306/root:123456@web-mysql:3306/g" /walle-web/walle/config/settings_prod.py && \
+	mysql  -hweb-mysql -uroot -p123456 -e 'CREATE SCHEMA walle' && \
+	sh admin.sh migration && \
+
+
+#COPY walle.sh /entrypoint/walle.sh
+#COPY walle.conf /etc/nginx/conf.d/walle.conf

src/docker/build/tool/walle/walle.conf

@@ -0,0 +1,41 @@
+upstream webservers {
+    server 0.0.0.0:5000 weight=1; # 负载设置
+}
+
+server {
+    listen       80;
+    server_name  admin.walle-web.io; # 域名设置
+    access_log   /usr/local/nginx/logs/walle.log main;
+    index index.html index.htm; # 日志目录
+
+    location / {
+        try_files $uri $uri/ /index.html;
+        add_header access-control-allow-origin *;
+        root /walle-web/fe; # 前端代码已集成到walle-web，即walle-web/fe的绝对路径
+    }
+
+    location ^~ /api/ {
+        add_header access-control-allow-origin *;
+        proxy_pass      http://webservers;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header  X-Real-IP  $remote_addr;
+        proxy_set_header    Origin        $host:$server_port;
+        proxy_set_header    Referer       $host:$server_port;
+    }
+
+    location ^~ /socket.io/ {
+        add_header access-control-allow-origin *;
+        proxy_pass      http://webservers;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header  X-Real-IP  $remote_addr;
+        proxy_set_header    Origin        $host:$server_port;
+        proxy_set_header    Referer       $host:$server_port;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-NginX-Proxy true;
+
+        # WebScoket Support
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+}

src/docker/build/tool/walle/walle.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env sh
+set -e
+
+start_nginx()
+{
+	#exec nginx
+	process_start nginx
+}
+
+stop_nginx()
+{
+    nginx -s stop
+}
+
+monit_nginx()
+{
+	process_monit nginx
+}

src/docker/conf/tool.conf

@@ -59,4 +59,9 @@ image = ffmpeg
 volumes = {container}web/mc/data:/tmp
 call = ffmpeg
 param = -i /tmp/001.avi -vcodec libx264 -threads 2 -preset fast -crf 28 -y -vf "scale=1920:-1" -acodec libmp3lame -ab 128k /tmp/out.mp4
-alias = ffmpeg
+alias = ffmpeg
+
+;walle
+[walle]
+image = walle
+port = 8080:80,5000:5000

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
 

src/docker/core.conf

@@ -81,6 +81,7 @@ pan					= tool/pan
 vsftpd				= tool/vsftpd
 nextcloud           = tool/nextcloud
 ffmpeg				= tool/ffmpeg
+walle				= tool/walle
 
 ;learn
 learn				= learning