diff --git a/modules/ROOT/pages/_partials/proc_adding-repositories.adoc b/modules/ROOT/pages/_partials/proc_adding-repositories.adoc index be81828..6a9c98e 100644 --- a/modules/ROOT/pages/_partials/proc_adding-repositories.adoc +++ b/modules/ROOT/pages/_partials/proc_adding-repositories.adoc @@ -1,7 +1,7 @@ [id='adding-repositories'] = Adding repositories -This section describes how to add software repositories with the `dnf config-manger` command. +This section describes how to add software repositories with the `dnf config-manager` command. Use the following commands as the `root` user or under the `sudo` utility. @@ -11,11 +11,11 @@ Use the following commands as the `root` user or under the `sudo` utility. + [literal,subs="+quotes,attributes"] ---- -# dnf config-manager --add-repo _repository_ +dnf config-manager --add-repo _repository_ ---- + Replace `_repository_` with the path to the created `.repo` file, for example: + ---- -# dnf config-manager --add-repo /etc/yum.repos.d/fedora_extras.repo +dnf config-manager --add-repo /etc/yum.repos.d/fedora_extras.repo ---- diff --git a/modules/ROOT/pages/_partials/proc_configuring-apache-httpd.adoc b/modules/ROOT/pages/_partials/proc_configuring-apache-httpd.adoc index 4f0789d..3c9572d 100644 --- a/modules/ROOT/pages/_partials/proc_configuring-apache-httpd.adoc +++ b/modules/ROOT/pages/_partials/proc_configuring-apache-httpd.adoc @@ -7,20 +7,20 @@ Files in `/etc/httpd/conf.d/` are read in alphabetical order: a setting from `/e As a best practice, do not modify `/etc/httpd/conf/httpd.conf` or any of the `/etc/httpd/conf.d` files shipped by Fedora packages directly. If you make any local changes to these files, then any changes to them in newer package versions will not be directly applied. Instead, a `.rpmnew` file will be created, and you will have to merge the changes manually. -It is recommended to create a new file in `/etc/httpd/conf.d` which will take precedence over the file you wish to modify, and edit the required settings. For instance, to change a setting specified in `/etc/httpd/conf.d/foo.conf` you could create the file `/etc/httpd/conf.d/z-foo-local.conf`, and place your setting in that file. +It is recommended to create a new file in `/etc/httpd/conf.d/` which will take precedence over the file you wish to modify, and edit the required settings. For instance, to change a setting specified in `/etc/httpd/conf.d/foo.conf` you could create the file `/etc/httpd/conf.d/z-foo-local.conf`, and place your setting in that file. [NOTE] ==== After making any changes to your server configuration, execute the following command: ---- -# apachectl reload +sudo systemctl reload httpd.service ---- Certain changes may require Apache to be fully restarted. To fully restart Apache, execute the following command: ---- -# systemctl restart httpd.service +sudo systemctl restart httpd.service ---- ==== @@ -99,13 +99,13 @@ To allow Apache through the firewall at each boot: * For plain HTTP connections: + ---- -# firewall-cmd --permanent --add-service=http +sudo firewall-cmd --permanent --add-service=http ---- * For TLS/SSL connections: + ---- -# firewall-cmd --permanent --add-service=https +sudo firewall-cmd --permanent --add-service=https ---- To allow Apache through the firewall instantly: @@ -113,13 +113,13 @@ To allow Apache through the firewall instantly: * For plain HTTP connections: + ---- -# firewall-cmd --add-service=http +sudo firewall-cmd --add-service=http ---- * For TLS/SSL connections: + ---- -# firewall-cmd --add-service=https +sudo firewall-cmd --add-service=https ---- NOTE: If your server is running in a network with a NAT router, you will also need to configure your router to forward the HTTP and HTTPS ports to your server, if you wish to allow access from outside your local network. diff --git a/modules/ROOT/pages/_partials/proc_installing-httpd.adoc b/modules/ROOT/pages/_partials/proc_installing-httpd.adoc index c2ac6b7..376c737 100644 --- a/modules/ROOT/pages/_partials/proc_installing-httpd.adoc +++ b/modules/ROOT/pages/_partials/proc_installing-httpd.adoc @@ -6,13 +6,13 @@ This procedure describes the steps to install Apache *HTTPD* on Fedora. . Install *HTTPD* packages. + ---- -# dnf install httpd -y +sudo dnf install httpd -y ---- . Start the *HTTPD* service. + ---- -# systemctl start httpd.service +sudo systemctl start httpd.service ---- [NOTE] @@ -20,7 +20,7 @@ This procedure describes the steps to install Apache *HTTPD* on Fedora. To enable auto start of *HTTPD* service at boot, execute the following command: ---- -# systemctl enable httpd.service +sudo systemctl enable httpd.service ---- ==== diff --git a/modules/ROOT/pages/_partials/proc_installing-webapps.adoc b/modules/ROOT/pages/_partials/proc_installing-webapps.adoc index 7309d8b..04ded0f 100644 --- a/modules/ROOT/pages/_partials/proc_installing-webapps.adoc +++ b/modules/ROOT/pages/_partials/proc_installing-webapps.adoc @@ -14,7 +14,7 @@ They will also often have the default configuration tweaked according to Fedora' Most web applications are simply packaged according to their name. For instance, you can install Wordpress by executing the following command: ---- -# dnf install wordpress +sudo dnf install wordpress ---- Packaged web applications will usually provide Fedora-specific instructions in a documentation file. For instance, Wordpress provides the files `/usr/share/doc/wordpress/README.fedora` and `/usr/share/doc/wordpress/README.fedora-multiuser`. diff --git a/modules/ROOT/pages/_partials/proc_securing-apache-httpd.adoc b/modules/ROOT/pages/_partials/proc_securing-apache-httpd.adoc index d10caa4..c35a5a5 100644 --- a/modules/ROOT/pages/_partials/proc_securing-apache-httpd.adoc +++ b/modules/ROOT/pages/_partials/proc_securing-apache-httpd.adoc @@ -18,7 +18,7 @@ To enable TLS/SSL support, download and install one of the following packages: The https://apps.fedoraproject.org/packages/mod_ssl[mod_ssl] package will be automatically enabled post installation. Install the https://apps.fedoraproject.org/packages/mod_ssl[mod_ssl] package using the following command: ---- -# dnf install mod_ssl -y +sudo dnf install mod_ssl -y ---- @@ -37,8 +37,8 @@ If you already have a certificate generated on another computer, do the followin . Move the certificate and the key file to the correct folder + ---- -# mv key_file.key /etc/pki/tls/private/myhost.com.key -# mv certificate.crt /etc/pki/tls/certs/myhost.com.crt +sudo mv key_file.key /etc/pki/tls/private/myhost.com.key +sudo mv certificate.crt /etc/pki/tls/certs/myhost.com.crt ---- + . Ensure that the following parameters are correct: @@ -46,22 +46,22 @@ If you already have a certificate generated on another computer, do the followin .. SELinux contexts + ---- -# restorecon /etc/pki/tls/private/myhost.com.key -# restorecon /etc/pki/tls/certs/myhost.com.crt +restorecon /etc/pki/tls/private/myhost.com.key +restorecon /etc/pki/tls/certs/myhost.com.crt ---- + .. Ownership + ---- -# chown root.root /etc/pki/tls/private/myhost.com.key -# chown root.root /etc/pki/tls/certs/myhost.com.crt +sudo chown root.root /etc/pki/tls/private/myhost.com.key +sudo chown root.root /etc/pki/tls/certs/myhost.com.crt ---- + .. Permissions + ---- -# chmod 0600 /etc/pki/tls/private/myhost.com.key -# chmod 0600 /etc/pki/tls/certs/myhost.com.crt +sudo chmod 0600 /etc/pki/tls/private/myhost.com.key +sudo chmod 0600 /etc/pki/tls/certs/myhost.com.crt ---- After installing the existing certificate, set up the certificate using <>. diff --git a/modules/ROOT/pages/adding-or-removing-software-repositories-in-fedora.adoc b/modules/ROOT/pages/adding-or-removing-software-repositories-in-fedora.adoc index db6c7c9..905ab3e 100644 --- a/modules/ROOT/pages/adding-or-removing-software-repositories-in-fedora.adoc +++ b/modules/ROOT/pages/adding-or-removing-software-repositories-in-fedora.adoc @@ -5,8 +5,6 @@ ifdef::context[:parent-context: {context}] [id='adding-or-removing-software-repositories-in-fedora'] = Adding or removing software repositories in Fedora -include::{partialsdir}/unreviewed-message.adoc[] - This section describes how to add, enable, or disable a software repository with the DNF application. include::{partialsdir}/proc_adding-repositories.adoc[leveloffset=+1] diff --git a/modules/ROOT/pages/getting-started-with-apache-http-server.adoc b/modules/ROOT/pages/getting-started-with-apache-http-server.adoc index 830c6ff..0a96a12 100644 --- a/modules/ROOT/pages/getting-started-with-apache-http-server.adoc +++ b/modules/ROOT/pages/getting-started-with-apache-http-server.adoc @@ -3,8 +3,6 @@ ifdef::context[:parent-context: {context}] [id='getting-started-with-apache-http-server'] = Getting started with Apache HTTP Server -include::{partialsdir}/unreviewed-message.adoc[] - The Apache HTTP Server is one of the most commonly-used web servers. This section acts as a quick-start guide to deploying and configuring Apache on Fedora. include::{partialsdir}/proc_installing-httpd.adoc[leveloffset=+1]