From 9d7ea3951e732fc355333807ab91a44ee476cd80 Mon Sep 17 00:00:00 2001
From: iotcat <i@iotcat.me>
Date: Sat, 11 Jan 2020 03:01:16 +0800
Subject: [PATCH] auto update

---
 ushio/opt/danmaku                |  1 +
 yimian/conf/nginx/acg.watch.conf | 47 ++++++++++++++++++++++++++++++++
 yimian/www/acg.watch/index.html  |  1 +
 yimian/www/acg.watch/player      |  1 +
 4 files changed, 50 insertions(+)
 create mode 160000 ushio/opt/danmaku
 create mode 100644 yimian/conf/nginx/acg.watch.conf
 create mode 100644 yimian/www/acg.watch/index.html
 create mode 160000 yimian/www/acg.watch/player

diff --git a/ushio/opt/danmaku b/ushio/opt/danmaku
new file mode 160000
index 00000000..8f319b3c
--- /dev/null
+++ b/ushio/opt/danmaku
@@ -0,0 +1 @@
+Subproject commit 8f319b3c2752ac8bfa9b1f459811dec98acfe9ce
diff --git a/yimian/conf/nginx/acg.watch.conf b/yimian/conf/nginx/acg.watch.conf
new file mode 100644
index 00000000..002e0419
--- /dev/null
+++ b/yimian/conf/nginx/acg.watch.conf
@@ -0,0 +1,47 @@
+server {
+    listen       80;
+    listen       [::]:80;
+    server_name  acg.watch;
+    rewrite ^(.*)$  https://$host$1 permanent;
+}
+
+
+server {
+    #listen       80;
+    #listen       [::]:80;
+    listen       443 ssl;
+
+    server_name  acg.watch;
+    root         /home/yimian/www/acg.watch;
+    index index.php index.html;
+
+    ssl_certificate /etc/ssl.yimian.xyz/acg.watch/acg.watch.crt; #2
+    ssl_certificate_key /etc/ssl.yimian.xyz/acg.watch/acg.watch.key; #3
+
+    ssl_session_cache shared:SSL:1m;
+    ssl_session_timeout 5m;
+    ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_prefer_server_ciphers on;
+    #error_page 404 = /404.php;
+
+#   rewrite ^(.*)$  https://www.$host$1 permanent;
+
+    # Load configuration files for the default server block.
+    include /etc/nginx/default.d/*.conf;
+    include /home/ushio/conf/nginx/default.d/*.conf;
+
+#   if (-f $request_filename/index.html){     rewrite (.*) $1/index.html break; } 
+#   if (-f $request_filename/index.php){     rewrite (.*) $1/index.php; } 
+#   if (!-f $request_filename){     rewrite (.*) /index.php; }
+#   if (!-e $request_filename) {    rewrite ^(.*)$ /index.php$1 last; }
+
+
+    error_page 404 /404.html;
+        location = /40x.html {
+    }
+
+    error_page 500 502 503 504 /50x.html;
+        location = /50x.html {
+    }
+}
diff --git a/yimian/www/acg.watch/index.html b/yimian/www/acg.watch/index.html
new file mode 100644
index 00000000..2a2825c3
--- /dev/null
+++ b/yimian/www/acg.watch/index.html
@@ -0,0 +1 @@
+hi ACG.WATCHls
diff --git a/yimian/www/acg.watch/player b/yimian/www/acg.watch/player
new file mode 160000
index 00000000..1aacc176
--- /dev/null
+++ b/yimian/www/acg.watch/player
@@ -0,0 +1 @@
+Subproject commit 1aacc17605303b3efb78612b161c4d7577a947cd