From db493045b9bc00e26807e2c1978d0757f52db5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serge=20Crois=C3=A9?= Date: Fri, 21 Oct 2022 19:43:57 +0200 Subject: [PATCH 1/5] Update dokuwiki_server.md grammar: the default for OUTPUT is ACCEPT --- docs/guides/cms/dokuwiki_server.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/cms/dokuwiki_server.md b/docs/guides/cms/dokuwiki_server.md index 3597a43f2b..77fb4e9a48 100644 --- a/docs/guides/cms/dokuwiki_server.md +++ b/docs/guides/cms/dokuwiki_server.md @@ -235,8 +235,8 @@ First, modify or create the _/etc/firewall.conf_ file: ``` #IPTABLES=/usr/sbin/iptables -# Unless specified, the defaults for OUTPUT is ACCEPT -# The default for FORWARD and INPUT is DROP +# Unless specified, the default for OUTPUT is ACCEPT +# The default for FORWARD and INPUT is DROP # echo " clearing any existing rules and setting default policy.." iptables -F INPUT From 2590554b8298ac01637639d27718a177e4ebb770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serge=20Crois=C3=A9?= Date: Fri, 21 Oct 2022 20:04:13 +0200 Subject: [PATCH 2/5] Update dokuwiki_server.md plural: one of many wikis ... --- docs/guides/cms/dokuwiki_server.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/cms/dokuwiki_server.md b/docs/guides/cms/dokuwiki_server.md index 77fb4e9a48..8257bb2e36 100644 --- a/docs/guides/cms/dokuwiki_server.md +++ b/docs/guides/cms/dokuwiki_server.md @@ -26,7 +26,7 @@ Documentation can take many forms in an organization. Having a repository that y DokuWiki is a mature, fast, wiki that runs without a database, has built in security features, and is relatively easy to deploy. For more information on what DokuWiki can do, check out their [web page](https://www.dokuwiki.org/dokuwiki). -DokuWiki is just one of many wiki's available, though it's a pretty good one. One big pro is that DokuWiki is relatively lightweight and can run on a server that is already running other services, provided you have space and memory available. +DokuWiki is just one of many wikis available, though it's a pretty good one. One big pro is that DokuWiki is relatively lightweight and can run on a server that is already running other services, provided you have space and memory available. ## Installing Dependencies From 44e2961a92b8a7119ce4b8494c3b5c2f06dcf0b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serge=20Crois=C3=A9?= Date: Fri, 21 Oct 2022 20:22:34 +0200 Subject: [PATCH 3/5] Update cloud_server_using_nextcloud.md punctuation, drop-down, time zone --- .../cms/cloud_server_using_nextcloud.md | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/guides/cms/cloud_server_using_nextcloud.md b/docs/guides/cms/cloud_server_using_nextcloud.md index 690e76ea8a..f1a57e123d 100644 --- a/docs/guides/cms/cloud_server_using_nextcloud.md +++ b/docs/guides/cms/cloud_server_using_nextcloud.md @@ -165,7 +165,7 @@ Then find the line: `;date.timezone =` -We need to remove the remark (;) and set our timezone. For our example timezone, we would put in either: +We need to remove the remark (;) and set our time zone. For our example time zone, we would put in either: `date.timezone = "America/Chicago"` @@ -175,11 +175,11 @@ OR Then save an exit the php.ini file. -Note that for the sake of keeping things the same, your timezone in the _php.ini_ file should match up to your machine's timezone setting. You can find out what this is set to by doing the following: +Note that for the sake of keeping things the same, your timezone in the _php.ini_ file should match up to your machine's time zone setting. You can find out what this is set to by doing the following: `ls -al /etc/localtime` -Which should show you something like this, assuming you set your timezone when you installed Rocky Linux and are living in the Central time zone: +Which should show you something like this, assuming you set your time zone when you installed Rocky Linux and are living in the Central time zone: `/etc/localtime -> /usr/share/zoneinfo/America/Chicago` @@ -219,9 +219,9 @@ There are a couple of things that we want to do differently than the defaults th * At the top of the web page, where it says "Create an admin account", set the user and password. For the sake of this document, we are entering "admin" and setting a strong password. Remember to save this somewhere safe (like a password manager) so that you don't lose it! Even though you have typed into this field, don't hit 'Enter' until we have done all of the setup fields! * Under the "Configure the database" section, change from "SQLite" to "MySQL/MariaDB" by clicking on that button. -* Type the MariaDB root user and password that you set earlier into the "Database user" and "Database password" fields -* In the "Database name" field, type "nextcloud" -* In the "localhost" field, type "localhost:3306" (3306 is the default _mariadb_ connect port) +* Type the MariaDB root user and password that you set earlier into the "Database user" and "Database password" fields. +* In the "Database name" field, type "nextcloud". +* In the "localhost" field, type "localhost:3306" (3306 is the default _mariadb_ connect port). Once you have all this, click `Finish Setup` and you should be up and running. @@ -319,10 +319,10 @@ This install method for Nextcloud uses the server install .zip file. The next few steps assume that you are remotely connected to your Nextcloud server via _ssh_ with a remote console open: -* Navigate to the [Nextcloud web site](https://nextcloud.com/) -* Let your mouse hover over "Get Nextcloud" which will bring up a drop down menu. +* Navigate to the [Nextcloud web site](https://nextcloud.com/). +* Let your mouse hover over "Get Nextcloud" which will bring up a drop-down menu. * Click on "Server Packages". -* Right-click on "Download Nextcloud" and copy the link address. (the exact syntax of this is different browser to browser) +* Right-click on "Download Nextcloud" and copy the link address (the exact syntax of this is different browser to browser). * In your remote console on the Nextcloud server, type "wget" and then a space and paste in what you just copied. You should get something like the following: `wget https://download.nextcloud.com/server/releases/nextcloud-21.0.1.zip` * Once you hit enter, the download of the .zip file will start and will be completed fairly quickly. @@ -374,11 +374,11 @@ And you should see this screen: There are a couple of things that we want to do differently than the defaults that show up: * At the top of the web page, where it says "Create an admin account", set the user and password. For the sake of this document, we are entering "admin" and setting a strong password. Remember to save this somewhere safe (like a password manager) so that you don't lose it! Even though you have typed into this field, don't hit 'Enter' until we have done all of the setup fields! -* Under the "Storage & database" section, change the "Data folder" location from the default document root, to where we moved the data folder earlier: `/var/www/sub-domains/com.yourdomain.nextcloud/data` +* Under the "Storage & database" section, change the "Data folder" location from the default document root, to where we moved the data folder earlier: `/var/www/sub-domains/com.yourdomain.nextcloud/data`. * Under the "Configure the database" section, change from "SQLite" to "MySQL/MariaDB" by clicking on that button. * Type the MariaDB root user and password that you set earlier into the "Database user" and "Database password" fields -* In the "Database name" field, type "nextcloud" -* In the "localhost" field, type "localhost:3306" (3306 is the default _mariadb_ connect port) +* In the "Database name" field, type "nextcloud". +* In the "localhost" field, type "localhost:3306" (3306 is the default _mariadb_ connect port). Now cross your fingers and click "Finish Setup". From 3be749f6ff1c2ffca2d1a213cbe013571a9ae612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serge=20Crois=C3=A9?= Date: Fri, 21 Oct 2022 20:35:37 +0200 Subject: [PATCH 4/5] Update cloud_server_using_nextcloud.md time zone --- docs/guides/cms/cloud_server_using_nextcloud.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/cms/cloud_server_using_nextcloud.md b/docs/guides/cms/cloud_server_using_nextcloud.md index f1a57e123d..948fb9fc34 100644 --- a/docs/guides/cms/cloud_server_using_nextcloud.md +++ b/docs/guides/cms/cloud_server_using_nextcloud.md @@ -157,7 +157,7 @@ We also need a special empty file so that we can install Nextcloud. This file re #### Configuring PHP -We need to set the timezone for PHP. To do this, open up php.ini with your text editor of choice: +We need to set the time zone for PHP. To do this, open up php.ini with your text editor of choice: `vi /etc/php.ini` @@ -175,7 +175,7 @@ OR Then save an exit the php.ini file. -Note that for the sake of keeping things the same, your timezone in the _php.ini_ file should match up to your machine's time zone setting. You can find out what this is set to by doing the following: +Note that for the sake of keeping things the same, your time zone in the _php.ini_ file should match up to your machine's time zone setting. You can find out what this is set to by doing the following: `ls -al /etc/localtime` From e62b1bbeb039c058f8c2f02b32908edaedec46b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serge=20Crois=C3=A9?= Date: Fri, 21 Oct 2022 22:38:28 +0200 Subject: [PATCH 5/5] Update dokuwiki_server.md SSL: punctuation --- docs/guides/cms/dokuwiki_server.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/cms/dokuwiki_server.md b/docs/guides/cms/dokuwiki_server.md index 8257bb2e36..2868dba87d 100644 --- a/docs/guides/cms/dokuwiki_server.md +++ b/docs/guides/cms/dokuwiki_server.md @@ -13,7 +13,7 @@ tags: ## Prerequisites And Assumptions * A Rocky Linux instance installed on a server, container, or virtual machine. -* Comfort with modifying configuration files from the command line with an editor (our examples here will use _vi_, but you can substitute your favorite editor) +* Comfort with modifying configuration files from the command line with an editor (our examples here will use _vi_, but you can substitute your favorite editor). * Some knowledge about web applications and setup. * Our example will use the [Apache Sites Enabled](../web/apache-sites-enabled.md) for setup, so it is a good idea to review that routine if you plan on following along. * We will be using "example.com" as the domain name throughout this example. @@ -301,7 +301,7 @@ trusted (active) ### SSL -For the best security, you should consider using an SSL so that all web traffic is encrypted. You can purchase an SSL from an SSL provider or use [Let's Encrypt](../security/generating_ssl_keys_lets_encrypt.md) +For the best security, you should consider using an SSL so that all web traffic is encrypted. You can purchase an SSL from an SSL provider or use [Let's Encrypt](../security/generating_ssl_keys_lets_encrypt.md). ## Conclusion