diff options
| author | Pete Travis <immanetize@fedoraproject.org> | 2014-05-15 14:05:22 -0600 |
|---|---|---|
| committer | Pete Travis <immanetize@fedoraproject.org> | 2014-05-15 14:05:22 -0600 |
| commit | 6439126c141d2dddbcdacfb58882faa36383d113 (patch) | |
| tree | 70e46b3f30bb19702d02e57ae356b0cf5ab2f1c3 | |
| parent | a4cd831fbd924b766eb58b020a649f2f05b36807 (diff) | |
| download | fedora-cookbook-6439126c141d2dddbcdacfb58882faa36383d113.tar.gz fedora-cookbook-6439126c141d2dddbcdacfb58882faa36383d113.tar.xz fedora-cookbook-6439126c141d2dddbcdacfb58882faa36383d113.zip | |
markup repair
| -rw-r--r-- | en-US/Creating_GPG_Keys.xml | 15 | ||||
| -rw-r--r-- | en-US/GPG.xml | 9 | ||||
| -rw-r--r-- | en-US/Security/ssh-proxy.xml | 12 | ||||
| -rw-r--r-- | en-US/git/secure-git-pull.xml | 19 |
4 files changed, 22 insertions, 33 deletions
diff --git a/en-US/Creating_GPG_Keys.xml b/en-US/Creating_GPG_Keys.xml index bef0507..1a8eb9b 100644 --- a/en-US/Creating_GPG_Keys.xml +++ b/en-US/Creating_GPG_Keys.xml @@ -1,4 +1,3 @@ - <?xml version='1.0' encoding='utf-8' ?> <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ @@ -35,23 +34,23 @@ What keysize do you want? (2048) 3072 Requested keysize is 3072 bits Please specify how long the key should be valid. 0 = key does not expire - <n> = key expires in n days - <n>w = key expires in n weeks - <n>m = key expires in n months - <n>y = key expires in n years + <n> = key expires in n days + <n>w = key expires in n weeks + <n>m = key expires in n months + <n>y = key expires in n years Key is valid for? (0) 1y Key expires at Wed 15 Apr 2015 09:40:08 PM EDT Is this correct? (y/N) y You need a user ID to identify your key; the software constructs the user ID from the Real Name, Comment and Email Address in this form: - "Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>" + "Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>" Real name: Beefy Email address: beefy@fedoraproject.org Comment: FAKE You selected this USER-ID: - "Beefy (FAKE) <beefy@fedoraproject.org>" + "Beefy (FAKE) <beefy@fedoraproject.org>" Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o You need a Passphrase to protect your secret key. @@ -83,7 +82,7 @@ gpg: depth: 2 valid: 8 signed: 16 trust: 8-, 0q, 0n, 0m, 0f, 0u gpg: next trustdb check due at 2014-09-09 pub 3072R/20EE698C 2014-04-16 [expires: 2015-04-16] Key fingerprint = E6FE 3BF4 F307 00BD 6517 050F C159 309E 20EE 698C -uid Beefy (FAKE) <beefy@fedoraproject.org> +uid Beefy (FAKE) <beefy@fedoraproject.org> sub 3072R/C68ACE5D 2014-04-16 [expires: 2015-04-16] </screen> </para> diff --git a/en-US/GPG.xml b/en-US/GPG.xml index 7670e32..603472b 100644 --- a/en-US/GPG.xml +++ b/en-US/GPG.xml @@ -1,6 +1,4 @@ - -<?xml version='1.0' encoding='utf-8' ?> - <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ <!ENTITY % BOOK_ENTITIES SYSTEM "Fedora_Cookbook.ent"> %BOOK_ENTITIES; @@ -18,8 +16,9 @@ <para> <firstterm>GNU Privacy Guard</firstterm> or <firstterm>GnuPG</firstterm> or just plain <firstterm>GPG</firstterm> is an open source iteration of <firstterm>Pretty Good Privacy</firstterm> (PGP) and provides authentication and encryption for email and files based on asymmetric cryptography. Using GPG allows an individual or organization to help protect their coorespondances as they cross the Internet or other medium. </para> - <xi:include href="Creating_GPG_Keys.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - + <!-- + <xi:include href="Creating_GPG_Keys.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + --> </section> diff --git a/en-US/Security/ssh-proxy.xml b/en-US/Security/ssh-proxy.xml index 550cb82..2a06d16 100644 --- a/en-US/Security/ssh-proxy.xml +++ b/en-US/Security/ssh-proxy.xml @@ -1,4 +1,3 @@ - <?xml version='1.0' encoding='utf-8' ?> <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ @@ -38,9 +37,11 @@ The outside address for your internal network. Home users with dynamically assigned IP addresses should read <xref linkend="no-ip" /> </para></listitem> <listitem><para> - The address space for your internal network. On many home routers, this will be <systemitem class="ipaddress">192.168.1.*</systemitem> or <systemitem class="ipaddress">192.168.0.1> + The address space for your internal network. On many home routers, this will be <systemitem class="ipaddress">192.168.1.*</systemitem> or <systemitem class="ipaddress">192.168.0.1</systemitem> </para> - <warning> + </listitem> + </itemizedlist> + <warning> <title>Address Space Reuse</title> <para> Adddresses like <systemitem class="ipaddress">192.168.1.0/24</systemitem> are reserved for use in private networks. Because the proxy rule is applied based on the address space of the target, you should configure your router to use a less common set of addresses. @@ -49,8 +50,7 @@ If your router can give addresses in the <systemitem class="ipaddress">192.168.42.0/24</systemitem> network, for example, your proxy rule won't get in the way when connecting to machines on a different network that uses <systemitem class="ipaddress">192.168.1.0/24</systemitem> addresses. </para> </warning> - </itemizedlist> - </section> + </section> <section id="ssh-proxy-directions"> <title>Directions</title> <procedure> @@ -62,7 +62,7 @@ Open the firewall on all machines to ssh traffic. This is the default on most systems. Use the graphical firewall application <application>firewall-config</application>, or issue the commands below as root. <screen> <command>firewall-cmd --permanent --add-service=ssh</command> - <command>firewall-cmd --reload + <command>firewall-cmd --reload</command> </screen> </para></step> <step><para> diff --git a/en-US/git/secure-git-pull.xml b/en-US/git/secure-git-pull.xml index c2d21f3..6d6cf0b 100644 --- a/en-US/git/secure-git-pull.xml +++ b/en-US/git/secure-git-pull.xml @@ -1,4 +1,3 @@ - <?xml version='1.0' encoding='utf-8' ?> <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ @@ -31,9 +30,9 @@ </para></listitem> <listitem><para> A dedicated user account. - </listitem></para> + </para></listitem> <listitem><para> - A dedicated <xref linkend="section-id">SSH authentication key</section> + A dedicated <xref linkend="ssh-keygen">SSH authentication key</xref> </para></listitem> </itemizedlist> </section> @@ -43,6 +42,7 @@ <title>Configuring the host</title> <step><para> Create and configure a new user account to use for the transfer. For security reasons, this account will only be allowed to interact with git. + </para></step> <substeps> <step> <para>First, identify the path to your git repository. Store it in a shell variable, for convenience.</para> @@ -100,7 +100,7 @@ You can add the ssh public key to your git repository to share it, or tell git to ignore they key with the instructions below. <screen> <command>pushd $repo_directory</command> - <command>echo ".ssh/" >> .gitignore</command> + <command>echo ".ssh/" >> .gitignore</command> <command>git add .gitignore</command> <command>git commit -m "Ignore $repo_directory/.ssh"</command> <command>popd</command> @@ -113,16 +113,7 @@ <para> Configure the remote host to use your repository </para></step> - <step> - <para /> - </step> - <step> - <para /> - </step> - <step> - <para /> - </step> - </procedure> + </procedure> </section> <section> |