From 440143a4f8b78726772610b82a8bdd60224250d2 Mon Sep 17 00:00:00 2001 From: Petr Bokoc Date: Sep 16 2019 14:12:26 +0000 Subject: [PATCH 1/5] Branch for f31 and update version numbers --- diff --git a/antora.yml b/antora.yml index d70d031..60c00dd 100644 --- a/antora.yml +++ b/antora.yml @@ -1,5 +1,5 @@ --- name: fedora -version: rawhide +version: f31 # Navigation is in the main 'fedora' component: # https://pagure.io/fedora-docs/release-docs-home diff --git a/modules/install-guide/pages/_partials/entities.adoc b/modules/install-guide/pages/_partials/entities.adoc index 16e1df4..3b612bb 100644 --- a/modules/install-guide/pages/_partials/entities.adoc +++ b/modules/install-guide/pages/_partials/entities.adoc @@ -5,12 +5,12 @@ :HOLDER: Red Hat, Inc. and others -:NEXTVER: 31 +:NEXTVER: 32 -:PREVVER: 29 +:PREVVER: 30 :PRODUCT: Fedora -:PRODVER: 30 +:PRODVER: 31 :YEAR: 2019 diff --git a/site.yml b/site.yml index 5d10f4b..95d1a3a 100644 --- a/site.yml +++ b/site.yml @@ -6,7 +6,7 @@ content: - url: . branches: HEAD - url: https://pagure.io/fedora-docs/release-docs-home.git - branches: master + branches: f31 ui: bundle: url: https://asamalik.fedorapeople.org/ui-bundle.zip From 9d1121537860e97afa25248228a8c2e18f9e589c Mon Sep 17 00:00:00 2001 From: Petr Bokoc Date: Sep 17 2019 12:18:17 +0000 Subject: [PATCH 2/5] Update build scripts --- diff --git a/build.sh b/build.sh index 083da18..1e4db2d 100755 --- a/build.sh +++ b/build.sh @@ -1,35 +1,46 @@ #!/bin/sh -image="antora/antora" +image="docker.io/antora/antora" cmd="--html-url-extension-style=indexify site.yml" if [ "$(uname)" == "Darwin" ]; then # Running on macOS. # Let's assume that the user has the Docker CE installed # which doesn't require a root password. + echo "" + echo "This build script is using Docker container runtime to run the build in an isolated environment." + echo "" docker run --rm -it -v $(pwd):/antora $image $cmd elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then # Running on Linux. # Check whether podman is available, else faill back to docker # which requires root. + if [ -f /usr/bin/podman ]; then - runtime="podman" - else - runtime="docker" - fi - if groups | grep -wq "docker"; then - # Check if the current user is in the "docker" group. If true, no sudo is needed. echo "" - echo "This build script is using $runtime to run the build in an isolated environment." + echo "This build script is using Podman to run the build in an isolated environment." echo "" - $runtime run --rm -it -v $(pwd):/antora:z $image $cmd - else - # User isn't in the docker group; run the command with sudo. + podman run --rm -it -v $(pwd):/antora:z $image $cmd + + elif [ -f /usr/bin/docker ]; then + echo "" + echo "This build script is using Docker to run the build in an isolated environment." echo "" - echo "This build script is using $runtime to run the build in an isolated environment. You might be asked for your password." - echo "You can avoid this by adding your user to the 'docker' group, but be aware of the security implications. See https://docs.docker.com/install/linux/linux-postinstall/." + + if groups | grep -wq "docker"; then + docker run --rm -it -v $(pwd):/antora:z $image $cmd + else + echo "" + echo "This build script is using $runtime to run the build in an isolated environment. You might be asked for your password." + echo "You can avoid this by adding your user to the 'docker' group, but be aware of the security implications. See https://docs.docker.com/install/linux/linux-postinstall/." + echo "" + sudo docker run --rm -it -v $(pwd):/antora:z $image $cmd + fi + else echo "" - sudo $runtime run --rm -it -v $(pwd):/antora:z $image $cmd + echo "Error: Container runtime haven't been found on your system. Fix it by:" + echo "$ sudo dnf install podman" + exit 1 fi fi diff --git a/preview.sh b/preview.sh index 16d02d8..acc52af 100755 --- a/preview.sh +++ b/preview.sh @@ -9,28 +9,10 @@ if [ "$(uname)" == "Darwin" ]; then elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then # Running on Linux. - # Check whether podman is available, else faill back to docker - # which requires root. - if [ -f /usr/bin/podman ]; then - runtime="podman" - else - runtime="docker" - fi - if groups | grep -wq "docker"; then - # Check if the current user is in the "docker" group. If true, no sudo is needed. - echo "" - echo "This build script is using $runtime to run the build in an isolated environment." - echo "The preview will be available at http://localhost:8080/" - echo "" - $runtime run --rm -v $(pwd):/antora:ro,z -v $(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro,z -p 8080:80 nginx - else - # User isn't in the docker group; run the command with sudo. - echo "" - echo "This build script is using $runtime to run the build in an isolated environment. You might be asked for your password." - echo "You can avoid this by adding your user to the 'docker' group, but be aware of the security implications. See https://docs.docker.com/install/linux/linux-postinstall/." - echo "" - echo "The preview will be available at http://localhost:8080/" - echo "" - sudo $runtime run --rm -v $(pwd):/antora:ro,z -v $(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro,z -p 8080:80 nginx - fi + # Fedora Workstation has python3 installed as a default, so using that + echo "" + echo "The preview is available at http://localhost:8080" + echo "" + cd ./public + python3 -m http.server 8080 fi From cc6d18d3a74d39045cf7c25fd3f60ea031098296 Mon Sep 17 00:00:00 2001 From: Petr Bokoc Date: Sep 17 2019 12:18:17 +0000 Subject: [PATCH 3/5] Update LICENSE --- diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ba8d521 --- /dev/null +++ b/LICENSE @@ -0,0 +1,10 @@ +The text of and illustrations in this document are licensed by Red Hat +under a Creative Commons Attribution–Share Alike 3.0 Unported license +("CC-BY-SA"). An explanation of CC-BY-SA is available at +http://creativecommons.org/licenses/by-sa/3.0/. In accordance with +CC-BY-SA, if you distribute this document or an adaptation of it, you +must provide the URL for the original version. + +Red Hat, as the licensor of this document, waives the right to +enforce, and agrees not to assert, Section 4d of CC-BY-SA to the +fullest extent permitted by applicable law. From 2ab060bcfc3090220b54b5b8db752943abf2b491 Mon Sep 17 00:00:00 2001 From: Petr Bokoc Date: Nov 07 2019 14:33:00 +0000 Subject: [PATCH 4/5] Issue 33 - fix links for iso checksum verification --- diff --git a/modules/install-guide/pages/install/Preparing_for_Installation.adoc b/modules/install-guide/pages/install/Preparing_for_Installation.adoc index ad51ef6..b73c26d 100644 --- a/modules/install-guide/pages/install/Preparing_for_Installation.adoc +++ b/modules/install-guide/pages/install/Preparing_for_Installation.adoc @@ -163,12 +163,12 @@ You can also choose a Fedora _Spin_ featuring favorite alternative desktops or t Because transmission errors or other problems may corrupt the Fedora image you have downloaded, it is important to verify the file's integrity. After the images are created, an operation is performed on the file that produces a value called a `checksum` using a complex mathematical algorithm. The operation is sufficiently complex that *any change* to the original file will produce a different checksum. -By calculating the image's `checksum` on your own computer and comparing it to the original `checksum`, you can verify the image has not been tampered with or corrupted. The original checksum values are provided at link:++https://fedoraproject.org/verify++[], and are [command]#gpg# signed to demonstrate their integrity. +By calculating the image's `checksum` on your own computer and comparing it to the original `checksum`, you can verify the image has not been tampered with or corrupted. The original checksum values are provided at link:++https://getfedora.org/security/++[], and are [command]#gpg# signed to demonstrate their integrity. [[sect-verifying-windows]] ==== Verifying checksums on Windows systems -. Download the Fedora image of your choice from link:++https://fedoraproject.org/get-fedora++[] and the corresponding checksum file from link:++https://fedoraproject.org/verify++[] +. Download the Fedora image of your choice from link:++https://fedoraproject.org/get-fedora++[] and the corresponding checksum file from link:++https://getfedora.org/security/++[] . Open a [command]#powershell# session. @@ -219,7 +219,7 @@ echo "Checksum test failed." [[sect-verifying-nix]] ==== Verifying checksums on Linux and OSX systems -. Download the Fedora image of your choice from link:++https://fedoraproject.org/get-fedora++[] and the corresponding checksum file from link:++https://fedoraproject.org/verify++[] +. Download the Fedora image of your choice from link:++https://fedoraproject.org/get-fedora++[] and the corresponding checksum file from link:++https://getfedora.org/security/++[] . Open a terminal window, and navigate to the directory with the downloaded files. + From 0464764c27d351c309113a713b65838a18f478e3 Mon Sep 17 00:00:00 2001 From: Owen DeLong Date: Jan 13 2020 21:34:49 +0000 Subject: [PATCH 5/5] Update modules/install-guide/pages/advanced/Network_based_Installations.adoc Corrected RFC number for DHCP Architecture Option (digits were transposed claiming 4758, correct number is 4578). --- diff --git a/modules/install-guide/pages/advanced/Network_based_Installations.adoc b/modules/install-guide/pages/advanced/Network_based_Installations.adoc index ae122b2..7379882 100644 --- a/modules/install-guide/pages/advanced/Network_based_Installations.adoc +++ b/modules/install-guide/pages/advanced/Network_based_Installations.adoc @@ -1,4 +1,3 @@ - :experimental: include::{partialsdir}/entities.adoc[] @@ -78,7 +77,7 @@ option routers 192.168.1.1; . Add entries to point clients to their bootloader and the server that provides it to your subnet configuration in `/etc/dhcp/dhcpd.conf`. Because DHCP clients provide the server with identifying information along with their address request, BIOS clients and UEFI clients can each be directed to the correct bootloader. + ---- -# refer to RFC4758 for possible arch option values +# refer to RFC4578 for possible arch option values option arch code 93 = unsigned integer 16; subnet 192.168.1.0 netmask 255.255.255.0 {