Merge lp:~petermatulis/serverguide/1410-other_useful_applications-etckeeper+byobu into lp:serverguide/trunk

Proposed by Peter Matulis on 2014-12-05
Status: Merged
Merge reported by: Peter Matulis
Merged at revision: not available
Proposed branch: lp:~petermatulis/serverguide/1410-other_useful_applications-etckeeper+byobu
Merge into: lp:serverguide/trunk
Diff against target: 105 lines (+25/-21)
1 file modified
serverguide/C/other-apps.xml (+25/-21)
To merge this branch: bzr merge lp:~petermatulis/serverguide/1410-other_useful_applications-etckeeper+byobu
Reviewer Review Type Date Requested Status
Peter Matulis Approve on 2015-02-05
Doug Smythies 2014-12-05 Needs Fixing on 2015-01-05
Review via email: mp+243748@code.launchpad.net
To post a comment you must log in.
Doug Smythies (dsmythies) wrote :

Line 10: "be stored"
should be "to be stored"

Line 11: "and automatically commit changes"
should be "and automatically commits changes"

Otherwise O.K. so once fixed, go ahead and merge it.

review: Needs Fixing
Peter Matulis (petermatulis) wrote :

Done. I didn't update my MP but made the correction while committing. I'll try to avoid doing that in the future, it's confusing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'serverguide/C/other-apps.xml'
--- serverguide/C/other-apps.xml 2013-07-10 15:53:33 +0000
+++ serverguide/C/other-apps.xml 2014-12-05 01:25:06 +0000
@@ -151,8 +151,8 @@
151 <title>etckeeper</title>151 <title>etckeeper</title>
152152
153 <para>153 <para>
154 <application>etckeeper</application> allows the contents of <filename role="directory">/etc</filename> be easily stored in 154 <application>etckeeper</application> allows the contents of <filename role="directory">/etc</filename> be stored in a
155 Version Control System (VCS) repository. It hooks into <application>apt</application> to automatically commit changes to155 Version Control System (VCS) repository. It integrates with <application>APT</application> and automatically commit changes to
156 <filename>/etc</filename> when packages are installed or upgraded. Placing <filename>/etc</filename> under version control 156 <filename>/etc</filename> when packages are installed or upgraded. Placing <filename>/etc</filename> under version control
157 is considered an industry best practice, and the goal of <application>etckeeper</application> is to make this process as 157 is considered an industry best practice, and the goal of <application>etckeeper</application> is to make this process as
158 painless as possible. 158 painless as possible.
@@ -168,11 +168,9 @@
168168
169 <para>169 <para>
170 The main configuration file, <filename>/etc/etckeeper/etckeeper.conf</filename>, is fairly simple. The main option is which170 The main configuration file, <filename>/etc/etckeeper/etckeeper.conf</filename>, is fairly simple. The main option is which
171 VCS to use. By default <application>etckeeper</application> is configured to use 171 VCS to use and by default <application>etckeeper</application> is configured to use <application>Bazaar</application>. The
172 <application>bzr</application> for version control.172 repository is automatically initialized (and committed for the first time) during package installation. It is possible to undo
173 The repository is automatically initialized (and committed for the first173 this by entering the following command:
174 time) during package installation. It is possible to undo this by entering
175 the following command:
176 </para>174 </para>
177175
178<screen>176<screen>
@@ -180,11 +178,9 @@
180</screen>178</screen>
181179
182 <para>180 <para>
183 By default, etckeeper will commit uncommitted changes made to /etc daily.181 By default, etckeeper will commit uncommitted changes made to /etc daily. This can be disabled using the AVOID_DAILY_AUTOCOMMITS
184 This can be disabled using the AVOID_DAILY_AUTOCOMMITS configuration182 configuration option. It will also automatically commit changes before and after package installation. For a more precise tracking
185 option. It will also automatically commit changes before and after package183 of changes, it is recommended to commit your changes manually, together with a commit message, using:
186 installation. For a more precise tracking of changes, it is recommended
187 to commit your changes manually, together with a commit message, using:
188 </para>184 </para>
189185
190<screen>186<screen>
@@ -192,7 +188,7 @@
192</screen>188</screen>
193189
194 <para>190 <para>
195 Using the VCS commands you can view log information about files in <filename>/etc</filename>:191 Using bzr's VCS commands you can view log information:
196 </para>192 </para>
197193
198<screen>194<screen>
@@ -200,7 +196,7 @@
200</screen>196</screen>
201197
202 <para>198 <para>
203 To demonstrate the integration with the package management system, install <application>postfix</application>:199 To demonstrate the integration with the package management system (APT), install <application>postfix</application>:
204 </para>200 </para>
205201
206<screen>202<screen>
@@ -269,7 +265,7 @@
269 </para>265 </para>
270266
271<screen>267<screen>
272<command>sudo etckeeper commit "new host"</command>268<command>sudo etckeeper commit "added new host"</command>
273</screen>269</screen>
274270
275 <para>271 <para>
@@ -277,19 +273,27 @@
277 </para>273 </para>
278 274
279 </sect1>275 </sect1>
276
280 <sect1 id="byobu" status="review">277 <sect1 id="byobu" status="review">
281 <title>Byobu</title>278 <title>Byobu</title>
282279
283 <para>280 <para>
284 One of the most useful applications for any system administrator is <application>screen</application>. It allows the execution281 One of the most useful applications for any system administrator is an xterm multiplexor such as <application>screen</application> or
285 of multiple shells in one terminal. To make some of the advanced <application>screen</application> features more 282 <application>tmux</application>. It allows for the execution of multiple shells in one terminal. To make some of the advanced multiplexor
286 user friendly, and provide some useful information about the system, the <application>byobu</application> package was 283 features more user-friendly and provide some useful information about the system, the <application>byobu</application> package was created.
287 created. 284 It acts as a wrapper to these programs. By default Byobu uses tmux (if installed) but this can be changed by the user.
288 </para>285 </para>
289286
290 <para>287 <para>
291 When executing <application>byobu</application> pressing the <emphasis>F9</emphasis> key will bring up the 288 Invoke it simply with:
292 <application>Configuration</application> menu. This menu will allow you to:289 </para>
290
291<screen>
292<command>byobu</command>
293</screen>
294
295 <para>
296 Now bring up the configuration menu. By default this is done by pressing the <emphasis>F9</emphasis> key. This will allow you to:
293 </para>297 </para>
294298
295 <itemizedlist>299 <itemizedlist>

Subscribers

People subscribed via source and target branches