diff --git a/sources/share/20150824 Great Open Source Collaborative Editing Tools.md b/sources/share/20150824 Great Open Source Collaborative Editing Tools.md index c4746bc482..8f3e2853cb 100644 --- a/sources/share/20150824 Great Open Source Collaborative Editing Tools.md +++ b/sources/share/20150824 Great Open Source Collaborative Editing Tools.md @@ -1,3 +1,4 @@ +Translating by H-mudcup Great Open Source Collaborative Editing Tools ================================================================================ In a nutshell, collaborative writing is writing done by more than one person. There are benefits and risks of collaborative working. Some of the benefits include a more integrated / co-ordinated approach, better use of existing resources, and a stronger, united voice. For me, the greatest advantage is one of the most transparent. That's when I need to take colleagues' views. Sending files back and forth between colleagues is inefficient, causes unnecessary delays and leaves people (i.e. me) unhappy with the whole notion of collaboration. With good collaborative software, I can share notes, data and files, and use comments to share thoughts in real-time or asynchronously. Working together on documents, images, video, presentations, and tasks is made less of a chore. diff --git a/sources/tech/20151123 Data Structures in the Linux Kernel.md b/sources/tech/20151123 Data Structures in the Linux Kernel.md index 187b3ce9cd..d344eacd97 100644 --- a/sources/tech/20151123 Data Structures in the Linux Kernel.md +++ b/sources/tech/20151123 Data Structures in the Linux Kernel.md @@ -1,3 +1,5 @@ +Translating by DongShuaike + Data Structures in the Linux Kernel ================================================================================ diff --git a/sources/tech/20151201 Backup (System Restore Point) your Ubuntu or Linux Mint with SystemBack.md b/sources/tech/20151201 Backup (System Restore Point) your Ubuntu or Linux Mint with SystemBack.md index 98193a8f72..8fc02b4a9b 100644 --- a/sources/tech/20151201 Backup (System Restore Point) your Ubuntu or Linux Mint with SystemBack.md +++ b/sources/tech/20151201 Backup (System Restore Point) your Ubuntu or Linux Mint with SystemBack.md @@ -1,3 +1,5 @@ +Translating by DongShuaike + Backup (System Restore Point) your Ubuntu/Linux Mint with SystemBack ================================================================================ System Restore is must have feature for any OS that allows the user to revert their computer's state (including system files, installed applications, and system settings) to that of a previous point in time, which can be used to recover from system malfunctions or other problems. @@ -37,4 +39,4 @@ via: http://www.noobslab.com/2015/11/backup-system-restore-point-your.html 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出 -[1]:https://launchpad.net/systemback \ No newline at end of file +[1]:https://launchpad.net/systemback diff --git a/sources/tech/20151123 Assign Multiple IP Addresses To One Interface On Ubuntu 15.10.md b/translated/tech/20151123 Assign Multiple IP Addresses To One Interface On Ubuntu 15.10.md similarity index 71% rename from sources/tech/20151123 Assign Multiple IP Addresses To One Interface On Ubuntu 15.10.md rename to translated/tech/20151123 Assign Multiple IP Addresses To One Interface On Ubuntu 15.10.md index 65da864ec4..fd61e5a939 100644 --- a/sources/tech/20151123 Assign Multiple IP Addresses To One Interface On Ubuntu 15.10.md +++ b/translated/tech/20151123 Assign Multiple IP Addresses To One Interface On Ubuntu 15.10.md @@ -1,19 +1,18 @@ -ictlyh Translating -Assign Multiple IP Addresses To One Interface On Ubuntu 15.10 +在 Ubuntu 15.10 上为单个网卡设置多个 IP 地址 ================================================================================ -Some times you might want to use more than one IP address for your network interface card. What will you do in such cases? Buy an extra network card and assign new IP? No, It’s not necessary(at least in the small networks). We can now assign multiple IP addresses to one interface on Ubuntu systems. Curious to know how? Well, Follow me, It is not that difficult. +有时候你可能想在你的网卡上使用多个 IP 地址。遇到这种情况你会怎么办呢？买一个新的网卡并分配一个新的 IP？不，这没有必要（至少在小网络中）。现在我们可以在 Ubuntu 系统中为一个网卡分配多个 IP 地址。想知道怎么做到的？跟着我往下看，其实并不难。 -This method will work on Debian and it’s derivatives too. +这个方法也适用于 Debian 以及它的衍生版本。 -### Add additional IP addresses temporarily ### +### 临时添加 IP 地址 ### -First, let us find the IP address of the network card. In my Ubuntu 15.10 server, I use only one network card. +首先，让我们找到网卡的 IP 地址。在我的 Ubuntu 15.10 服务器版中，我只使用了一个网卡。 -Run the following command to find out the IP address: +运行下面的命令找到 IP 地址： sudo ip addr -**Sample output:** +**事例输出：** 1: lo: mtu 65536 qdisc noqueue state UNKNOWN group default link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 @@ -28,11 +27,11 @@ Run the following command to find out the IP address: inet6 fe80::a00:27ff:fe2a:34e/64 scope link valid_lft forever preferred_lft forever -Or +或 sudo ifconfig -**Sample output:** +**事例输出：** enp0s3 Link encap:Ethernet HWaddr 08:00:27:2a:03:4b inet addr:192.168.1.103 Bcast:192.168.1.255 Mask:255.255.255.0 @@ -51,19 +50,19 @@ Or collisions:0 txqueuelen:0 RX bytes:38793 (38.7 KB) TX bytes:38793 (38.7 KB) -As you see in the above output, my network card name is **enp0s3**, and its IP address is **192.168.1.103**. +正如你在上面看到的，我的网卡名称是 **enp0s3**，它的 IP 地址是 **192.168.1.103**。 -Now let us add an additional IP address, for example **192.168.1.104**, to the Interface card. +现在让我们来为网卡添加一个新的 IP 地址，例如说 **192.168.1.104**。 -Open your Terminal and run the following command to add additional IP. +打开你的终端并运行下面的命令添加额外的 IP。 sudo ip addr add 192.168.1.104/24 dev enp0s3 -Now, let us check if the IP is added using command: +用命令检查是否启用了新的 IP： sudo ip address show enp0s3 -**Sample output:** +**样例输出：** 2: enp0s3: mtu 1500 qdisc pfifo_fast state UP group default qlen 1000 link/ether 08:00:27:2a:03:4e brd ff:ff:ff:ff:ff:ff @@ -74,13 +73,13 @@ Now, let us check if the IP is added using command: inet6 fe80::a00:27ff:fe2a:34e/64 scope link valid_lft forever preferred_lft forever -Similarly, you can add as many IP addresses as you want. +类似地，你可以添加想要的任意多的 IP 地址。 -Let us ping the IP address to verify it. +让我们 ping 一下这个 IP 地址验证一下。 sudo ping 192.168.1.104 -**Sample output:** +**样例输出** PING 192.168.1.104 (192.168.1.104) 56(84) bytes of data. 64 bytes from 192.168.1.104: icmp_seq=1 ttl=64 time=0.901 ms @@ -88,17 +87,17 @@ Let us ping the IP address to verify it. 64 bytes from 192.168.1.104: icmp_seq=3 ttl=64 time=0.521 ms 64 bytes from 192.168.1.104: icmp_seq=4 ttl=64 time=0.524 ms -Yeah, It’s working!! +好极了，它能工作！ -To remove the IP, just run: +要删除 IP，只需要运行： sudo ip addr del 192.168.1.104/24 dev enp0s3 -Let us check if it is removed. +再检查一下是否删除了 IP。 sudo ip address show enp0s3 -**Sample output:** +**样例输出：** 2: enp0s3: mtu 1500 qdisc pfifo_fast state UP group default qlen 1000 link/ether 08:00:27:2a:03:4e brd ff:ff:ff:ff:ff:ff @@ -107,19 +106,19 @@ Let us check if it is removed. inet6 fe80::a00:27ff:fe2a:34e/64 scope link valid_lft forever preferred_lft forever -See, It’s gone!! +可以看到已经没有了！！ -Well, as you may know, the changes will lost after you reboot your system. How do I make it permanent? That’s easy too. +也许你已经知道，你重启系统后会丢失这些设置。那么怎么设置才能永久有效呢？这也很简单。 -### Add additional IP addresses permanently ### +### 添加永久 IP 地址 ### -The network card configuration file of your Ubuntu system is **/etc/network/interfaces**. +Ubuntu 系统的网卡配置文件是 **/etc/network/interfaces**。 -Let us check the details of the above file. +让我们来看看上面文件的具体内容。 sudo cat /etc/network/interfaces -**Sample output:** +**输出样例：** # This file describes the network interfaces available on your system # and how to activate them. For more information, see interfaces(5). @@ -131,15 +130,15 @@ Let us check the details of the above file. auto enp0s3 iface enp0s3 inet dhcp -As you see in the above output, the Interface is DHCP enabled. +正如你在上面输出中看到的，网卡启用了 DHCP。 -Okay, now we will assign an additional address, for example **192.168.1.104/24**. +现在，让我们来分配一个额外的地址，例如 **192.168.1.104/24**。 -Edit file **/etc/network/interfaces**: +编辑 **/etc/network/interfaces**： sudo nano /etc/network/interfaces -Add additional IP address as shown in the black letters. +按照黑色字体标注的添加额外的 IP 地址。 # This file describes the network interfaces available on your system # and how to activate them. For more information, see interfaces(5). @@ -153,13 +152,13 @@ Add additional IP address as shown in the black letters. iface enp0s3 inet static address 192.168.1.104/24 -Save and close the file. +保存并关闭文件。 -Run the following file to take effect the changes without rebooting. +无需重启运行下面的命令使更改生效。 sudo ifdown enp0s3 && sudo ifup enp0s3 -**Sample output:** +**样例输出：** Killed old client process Internet Systems Consortium DHCP Client 4.3.1 @@ -183,13 +182,13 @@ Run the following file to take effect the changes without rebooting. DHCPACK of 192.168.1.103 from 192.168.1.1 bound to 192.168.1.103 -- renewal in 35146 seconds. -**Note**: It is **very important** to run the above two commands into **one** line if you are remoting into the server because the first one will drop your connection. Given in this way the ssh-session will survive. +**注意**：如果你从远程连接到服务器，把上面的两个命令放到**一行**中**非常重要**，因为第一个命令会断掉你的连接。而采用这种方式可以存活你的 ssh 会话。 -Now, let us check if IP is added using command: +现在，让我们用下面的命令来检查一下是否添加了新的 IP： sudo ip address show enp0s3 -**Sample output:** +**输出样例：** 2: enp0s3: mtu 1500 qdisc pfifo_fast state UP group default qlen 1000 link/ether 08:00:27:2a:03:4e brd ff:ff:ff:ff:ff:ff @@ -200,13 +199,13 @@ Now, let us check if IP is added using command: inet6 fe80::a00:27ff:fe2a:34e/64 scope link valid_lft forever preferred_lft forever -Cool! Additional IP has been added. +很好！我们已经添加了额外的 IP。 -Well then let us ping the IP address to verify. +再次 ping IP 地址进行验证。 sudo ping 192.168.1.104 -**Sample output:** +**样例输出：** PING 192.168.1.104 (192.168.1.104) 56(84) bytes of data. 64 bytes from 192.168.1.104: icmp_seq=1 ttl=64 time=0.137 ms @@ -214,21 +213,21 @@ Well then let us ping the IP address to verify. 64 bytes from 192.168.1.104: icmp_seq=3 ttl=64 time=0.054 ms 64 bytes from 192.168.1.104: icmp_seq=4 ttl=64 time=0.067 ms -Voila! It’s working. That’s it. +好极了！它能正常工作。就是这样。 -Want to know how to add additional IP addresses on CentOS/RHEL/Scientific Linux/Fedora systems, check the following link. +想知道怎么给 CentOS/RHEL/Scientific Linux/Fedora 系统添加额外的 IP 地址，可以点击下面的链接。 注：此篇文章以前做过选题：20150205 Linux Basics--Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7.md - [Assign Multiple IP Addresses To Single Network Interface Card On CentOS 7][1] -Happy weekend! +周末愉快！ -------------------------------------------------------------------------------- via: http://www.unixmen.com/assign-multiple-ip-addresses-to-one-interface-on-ubuntu-15-10/ 作者：[SK][a] -译者：[译者ID](https://github.com/译者ID) +译者：[ictlyh](http://mutouxiaogui.cn/blog/) 校对：[校对者ID](https://github.com/校对者ID) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出 diff --git a/sources/tech/20151208 How to renew the ISPConfig 3 SSL Certificate.md b/translated/tech/20151208 How to renew the ISPConfig 3 SSL Certificate.md similarity index 50% rename from sources/tech/20151208 How to renew the ISPConfig 3 SSL Certificate.md rename to translated/tech/20151208 How to renew the ISPConfig 3 SSL Certificate.md index 600c8941cf..a2ce4f1d1c 100644 --- a/sources/tech/20151208 How to renew the ISPConfig 3 SSL Certificate.md +++ b/translated/tech/20151208 How to renew the ISPConfig 3 SSL Certificate.md @@ -1,20 +1,20 @@ -How to renew the ISPConfig 3 SSL Certificate +如何更新ISPConfig 3 SSL证书 ================================================================================ -This tutorial describes the steps to renew the SSL Certificate of the ISPConfig 3 control panel. There are two alternative ways to achieve that: +本教程描述了如何再ISPConfig 3控制面板中更新SSL证书。有两个可选的方法： -- Create a new OpenSSL Certificate and CSR on the command line with OpenSSL. -- Renew the SSL Certificate with the ISPConfig updater +- 用OpenSSL创建一个新的OpenSSL证书和CSR。 +- 用ISPConfig updater更新SSL证书 -I'll start with the manual way to renew the ssl cert. +我将会用手工的方法更新ssl证书。 -### 1) Create a new ISPConfig 3 SSL Certificate with OpenSSL ### +### 1）用OpenSSL创建一个新的ISPConfig 3 SSL 证书 ### -Login to your server on the shell as root user. Before we create a new SSL Cert, backup the current ones. SSL Certs are security sensitive so I'll store the backup in the /root/ folder. +用root用户登录你的服务器。在创建一个新的SSL证书之前，备份现有的。SSL证书是安全敏感的，因此我将它存储在/root/目录下。 tar pcfz /root/ispconfig_ssl_backup.tar.gz /usr/local/ispconfig/interface/ssl chmod 600 /root/ispconfig_ssl_backup.tar.gz -> Now create a new SSL Certificate key, Certificate Request (csr) and a self signed Certificate. +> 现在创建一个新的SSL证书密钥，证书请求（csr）和自签发证书。 cd /usr/local/ispconfig/interface/ssl openssl genrsa -des3 -out ispserver.key 4096 @@ -25,14 +25,13 @@ Login to your server on the shell as root user. Before we create a new SSL Cert, mv ispserver.key ispserver.key.secure mv ispserver.key.insecure ispserver.key -Restart Apache to load the new SSL Certificate. +重启apache来加载新的SSL证书 service apache2 restart -### 2) Renew the SSL Certificate with the ISPConfig installer ### +### 2）用ISPConfig安装器来更新SSL证书 ### -The alternative way to get a new SSL Certificate is to use the ISPConfig update script. -Download ISPConfig to the /tmp folder, unpack the archive and start the update script. +另一个获取新的SSL证书的替代方案是使用ISPConfig更新脚本。下载ISPConfig到/tmp目录下，解压包并运行脚本。 cd /tmp wget http://www.ispconfig.org/downloads/ISPConfig-3-stable.tar.gz @@ -40,20 +39,20 @@ Download ISPConfig to the /tmp folder, unpack the archive and start the update s cd ispconfig3_install/install php -q update.php -The update script will ask the following question during update: +更新脚本会在更新时询问下面的额问题： Create new ISPConfig SSL certificate (yes,no) [no]: -Answer "yes" here and the SSL Certificate creation dialog will start. +这里回答“yes”，SSL证书创建对话框就会启动。 -------------------------------------------------------------------------------- via: http://www.faqforge.com/linux/how-to-renew-the-ispconfig-3-ssl-certificate/ 作者：[Till][a] -译者：[译者ID](https://github.com/译者ID) +译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID) 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出 -[a]:http://www.faqforge.com/author/till/ \ No newline at end of file +[a]:http://www.faqforge.com/author/till/