From f117f1bbf276319bff6816afaf8dddf6802c00c4 Mon Sep 17 00:00:00 2001
From: light <1870499383@qq.com>
Date: Sun, 16 Sep 2018 11:16:52 +0800
Subject: [PATCH] update

---
 database/mysql.md  | 17 +++++++++++++++++
 env/ubuntu18.04.md | 35 ++++++++++++++++++++++++++++++++++-
 git/gitolite.md    | 22 ++++++++++++++++++++++
 opencv/install.md  | 28 +++++++++++++++++++++++++---
 redis/配置.md      |  2 +-
 ubuntu/iptables.md |  6 ++++++
 ubuntu/monitor.md  |  6 ++++++
 ubuntu/sudo.md     |  7 ++++---
 8 files changed, 115 insertions(+), 8 deletions(-)
 create mode 100644 database/mysql.md
 create mode 100644 ubuntu/monitor.md

diff --git a/database/mysql.md b/database/mysql.md
new file mode 100644
index 0000000..1aba218
--- /dev/null
+++ b/database/mysql.md
@@ -0,0 +1,17 @@
+# mysql
+
+## download
+
+docker pull mysql:5.6
+
+## run
+
+``` bash
+cd ~
+mkdir mysql
+cd mysql
+
+docker run -p 3306:3306 --name mymysql -v ~/mysql/conf:/etc/mysql/conf.d -v ~/mysql/logs:/logs -v ~/mysql/data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=123456 -d mysql:5.6
+
+docker exec -i -t  id /bin/bash
+```
\ No newline at end of file
diff --git a/env/ubuntu18.04.md b/env/ubuntu18.04.md
index 241fdd0..daf0f35 100644
--- a/env/ubuntu18.04.md
+++ b/env/ubuntu18.04.md
@@ -37,4 +37,37 @@ sudo dpkg -i sogou***.deb
 
 ## Coverflow Alt-Tab 
 
-优化 alt tab
\ No newline at end of file
+在ubuntu software 里搜索下载 优化 alt tab (推荐 动画很好看)
+
+## hide top bar
+
+在ubuntu software 里搜索下载 可以隐藏 顶部栏
+
+## ifconfig not found
+
+> sudo apt install net-tools
+
+
+## 更改主题
+
+```bash
+sudo apt-get install gnome-shell-extensions
+sudo reboot -h now # 重启后需要去tweak上启用
+sudo apt install chrome-gnome-shell
+```
+
+## shadowsocks
+
+```bash
+sudo pip install shadowsocks
+# download https://github.com/FelisCatus/SwitchyOmega/releases/download/v2.3.19/SwitchyOmega.crx
+
+
+```
+
+
+## referring
+
+```bash
+http://blog.51cto.com/13589319/2120571
+```
diff --git a/git/gitolite.md b/git/gitolite.md
index 0415207..d1d0956 100644
--- a/git/gitolite.md
+++ b/git/gitolite.md
@@ -18,4 +18,26 @@ mkdir -p ~/bin
 
 ~/gitolite/install -to ~/bin  
 
+echo "export PATH=/home/git/bin:\$PATH" > .bashrc
+
+gitolite setup -pk admin.pub
+
+```
+
+``` bash
+git clone git@git.test:gitolite-admin.git
+```
+
+## re_init
+``` bash
+rm -rf .gitolite.rc  
+rm -rf repositories
+rm -rf bin	
+rm -rf .gitolite  
+rm -rf projects.list
+rm -rf .ssh
+
+mkdir -p ~/bin
+~/gitolite/install -to ~/bin
+gitolite setup -pk admin.pub
 ```
\ No newline at end of file
diff --git a/opencv/install.md b/opencv/install.md
index 9f96dee..25cfc87 100644
--- a/opencv/install.md
+++ b/opencv/install.md
@@ -77,16 +77,17 @@ sudo apt install libavcodec-dev libavformat-dev libswscale-dev libv4l-dev
 sudo apt install libxvidcore-dev libx264-dev
 
 # 安装gtk， 用于opencv gui显示
-sudo apt install libgtk2.0-dev
+sudo apt install libgtk2.0-dev 
 
 
 sudo apt install libatlas-base-dev gfortran
 
 
 # 安装python 环境
-sudo apt-get install python2.7-dev python3-dev
+sudo apt-get install python-dev python3-dev
 sudo apt-get install build-essential libssl-dev libevent-dev libjpeg-dev libxml2-dev libxslt-dev
 
+
 unzip ....
 
 cd opencv
@@ -95,7 +96,6 @@ cd build
 # warning change your path
 cmake -D CMAKE_BUILD_TYPE=RELEASE \
     -D CMAKE_INSTALL_PREFIX=/usr/local \
-    -D OPENCV_EXTRA_MODULES_PATH=/program/opencv_contrib-3.3.0/modules \
     -D ENABLE_NEON=ON \
     -D ENABLE_VFPV3=ON \
     -D BUILD_TESTS=OFF \
@@ -119,5 +119,27 @@ sudo ldconfig
 
 xhost +
 export DISPLAY=:0.0
+```
 
+## cross compile
+> referring https://blog.csdn.net/sun_28/article/details/52760463
+> referring https://docs.opencv.org/master/d0/d76/tutorial_arm_crosscompile_with_cmake.html
+> referring http://shumeipai.nxez.com/2013/10/08/configure-cross-compiler-platform-raspberry-pi.html
+
+
+``` bash
+
+sudo apt-get install libavcodec-dev libavformat-dev libswscale-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev
+
+
+mkdir cross_compile_raspberry
+cd cross_compile_raspberry/
+git clone git://github.com/raspberrypi/tools.git --depth=1
+unzip opencv.zip ./
+
+cd opencv
+mkdir build
+cd build
+sudo apt-get install cmake-qt-gui
+cmake-gui
 ```
\ No newline at end of file
diff --git a/redis/配置.md b/redis/配置.md
index f1419d2..663c30b 100755
--- a/redis/配置.md
+++ b/redis/配置.md
@@ -88,5 +88,5 @@ esac
 
 ``` bash
 mkdir /db/redis/
-docker run -p 6379:6379 -v /db/redis/:/data  -d redis redis-server --appendonly yes
+docker run -p 6379:6379 -v /data/redis/:/data  -d redis redis-server --appendonly yes
 ```
\ No newline at end of file
diff --git a/ubuntu/iptables.md b/ubuntu/iptables.md
index 55e96ed..1f28349 100755
--- a/ubuntu/iptables.md
+++ b/ubuntu/iptables.md
@@ -20,6 +20,12 @@ iptables -t 表名 <-A/I/D/R> 规则链名 [规则号] <-i/o 网卡名> -p 协
 
 ```
 
+## 转发80端口到其他端口
+
+``` bash
+iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 4000
+```
+
 ## 设置静态ip
 
 > sudo nano /etc/network/interfaces
diff --git a/ubuntu/monitor.md b/ubuntu/monitor.md
new file mode 100644
index 0000000..ff7f870
--- /dev/null
+++ b/ubuntu/monitor.md
@@ -0,0 +1,6 @@
+sudo ifconfig wlan0 down
+sudo iwconfig wlan0 mode Monitor
+sudo ifconfig wlan0 up
+
+## if rfkill error
+rfkill unblock wifi
diff --git a/ubuntu/sudo.md b/ubuntu/sudo.md
index 0aa12aa..b3be8d6 100644
--- a/ubuntu/sudo.md
+++ b/ubuntu/sudo.md
@@ -7,8 +7,9 @@
 
 ``` bash
 
-light   ALL=(ALL) NOPASSWD: ALL
-%admin ALL=(ALL) NOPASSWD: ALL
-%sudo   ALL=(ALL) NOPASSWD: ALL
+%sudo   ALL=(ALL:ALL) ALL
+
+# 改成  
+%sudo   ALL=(ALL:ALL) NOPASSWD:ALL
 
 ```
\ No newline at end of file