vim-d file01 file02 diff file01 File02 compare two files in different

Source: Internet
Author: User
Tags diff






[[email protected] vhosts]# vim -d defaul.conf.bak zabbix.xinxianm.com.conf 

 

server {                                            |  server {
          listen       80;                            |          listen       80;
          server_name  localhost;                     |          server_name  localhost zabbix.xinxianm.com; 
          index index.html index.htm index.php;       |          index index.html index.htm index.php;
          root /alidata/www/default;                  |          root /usr/html/zabbix;                      
          location ~ .*\.(php|php5)?$                 |          location ~ .*\.(php|php5)                   
          {                                           |          {
                  #fastcgi_pass  unix:/tmp/php-cgi.soc|                  #fastcgi_pass  unix:/tmp/php-cgi.soc
                  fastcgi_pass  127.0.0.1:9000;       |                  fastcgi_pass  127.0.0.1:9000;
                  fastcgi_index index.php;            |                  fastcgi_index index.php;
                  include fastcgi.conf;               |                  include fastcgi.conf;
  ----------------------------------------------------|                  fastcgi_param PATH_INFO $fastcgi_scr
          }                                           |          }
          location ~ .*\.(gif|jpg|jpeg|png|bmp|swf)$  |          location ~ .*\.(gif|jpg|jpeg|png|bmp|swf)$
          {                                           |          {
                  expires 30d;                        |                  expires 30d;
          }                                           |          }
          location ~ .*\.(js|css)?$                   |          location ~ .*\.(js|css)?$
          {                                           |          {
                  expires 1h;                         |                  expires 1h;
          }                                           |          }
          #α¾²Ì¬¹æÔò                                 |  ----------------------------------------------------
          include /etc/nginx/rewrite/default.conf;    |          include /etc/nginx/rewrite/default.conf;
          access_log  /var/log/nginx/default.log;     |          access_log  /var/log/nginx/zabbix.log;      
  }                                                   |  }
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
  ~                                                   |  ~                                                   
defaul.conf.bak                     1,1            All zabbix.xinxianm.com.conf            1,1            All
"zabbix.xinxianm.com.conf" 24L, 550C





vim-d file01 file02 diff file01 File02 compare two files in different


Related Article

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.