From 116c944be9bf60551e47e2757a69606c06b885ec Mon Sep 17 00:00:00 2001 From: Robert Krátký Date: Aug 30 2017 18:07:21 +0000 Subject: Fixes that break stuff. --- diff --git a/README.md b/README.md index 6d3e4fa..32e0fe7 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ For a thorough explanation, description of different types of modules, and real- 2. Run `asciidoctor` on the `index.adoc` file in the repo's root: ``` - $ asciidoctor -a toc -n index.adoc + $ asciidoctor index.adoc ``` 3. Open the resulting HTML file in a browser of your choice: diff --git a/en-US/sysadmin_user_stories/assembly-adding_new_user_accounts.adoc b/en-US/sysadmin_user_stories/assembly-adding_new_user_accounts.adoc index 3c8de62..3137c9e 100644 --- a/en-US/sysadmin_user_stories/assembly-adding_new_user_accounts.adoc +++ b/en-US/sysadmin_user_stories/assembly-adding_new_user_accounts.adoc @@ -1,4 +1,5 @@ -[#adding-a-new-user-account] +:assembly: adding_a_new_user_account +[#{assembly}] = Adding a New User Account This section describes how you can add a new user account so that another person can use the system as a regular user. @@ -13,9 +14,9 @@ include::concept-what_happens_when_a_new_user_is_created.adoc[leveloffset=+1] include::procedure-useradd.adoc[leveloffset=+1] -include::procedure-creating_a_user_group.adoc[leveloffset=+1] +// include::procedure-creating_a_user_group.adoc[leveloffset=+1] -include::procedure-adding_users_to_user_groups.adoc[leveloffset=+1] +// include::procedure-adding_users_to_user_groups.adoc[leveloffset=+1] == Additional Resources diff --git a/en-US/sysadmin_user_stories/assembly-adjusting_file_permissions.adoc b/en-US/sysadmin_user_stories/assembly-adjusting_file_permissions.adoc index 277be64..26cab40 100644 --- a/en-US/sysadmin_user_stories/assembly-adjusting_file_permissions.adoc +++ b/en-US/sysadmin_user_stories/assembly-adjusting_file_permissions.adoc @@ -1,4 +1,5 @@ -[#adjusting-file-permissions] +:assembly: adjusting_file_permissions +[#{assembly}] = Adjusting File Permissions This section describes how you can adjust permissions for a file or directory so that a specific user or user group can read, write, or execute the file or directory. diff --git a/en-US/sysadmin_user_stories/assembly-changing_default_database_location.adoc b/en-US/sysadmin_user_stories/assembly-changing_default_database_location.adoc index 0d4fd86..c75fb51 100644 --- a/en-US/sysadmin_user_stories/assembly-changing_default_database_location.adoc +++ b/en-US/sysadmin_user_stories/assembly-changing_default_database_location.adoc @@ -1,4 +1,5 @@ -[#changing-default-mariadb-database-location] +:assembly: changing_default_mariadb_database_location +[#{assembly}] = Changing Default MariaDB Database Location This section describes how you can change the default location for MariaDB. diff --git a/en-US/sysadmin_user_stories/assembly-configuring_password_policies_for_users.adoc b/en-US/sysadmin_user_stories/assembly-configuring_password_policies_for_users.adoc index 4a4bf33..7d260b9 100644 --- a/en-US/sysadmin_user_stories/assembly-configuring_password_policies_for_users.adoc +++ b/en-US/sysadmin_user_stories/assembly-configuring_password_policies_for_users.adoc @@ -1,11 +1,12 @@ -[#configuring_password_policies] +:assembly: configuring_password_policies +[#{assembly}] = Configuring Password Policies This section describes how to configure a password policy for a user. .Prerequisites -* User account created. See <>. +* User account created. See <>. include::procedure-setting_passwords.adoc[leveloffset=+1] diff --git a/en-US/sysadmin_user_stories/assembly-creating_group_directories.adoc b/en-US/sysadmin_user_stories/assembly-creating_group_directories.adoc index 9e60fb8..5bdd9a5 100644 --- a/en-US/sysadmin_user_stories/assembly-creating_group_directories.adoc +++ b/en-US/sysadmin_user_stories/assembly-creating_group_directories.adoc @@ -1,4 +1,5 @@ -[#creating_group_directories] +:assembly: creating_group_directories +[#{assembly}] = Creating Group Directories // Ideally, base the name of the file on the title to avoid confusion @@ -28,4 +29,4 @@ include::reference-useradd_command_line_options.adoc[leveloffset=+1] == Additional Resources -* For details on groups, see <>. +* For details on groups, see <>. diff --git a/en-US/sysadmin_user_stories/assembly-verifying_file_permissions.adoc b/en-US/sysadmin_user_stories/assembly-verifying_file_permissions.adoc index 66a5a11..cac6b3e 100644 --- a/en-US/sysadmin_user_stories/assembly-verifying_file_permissions.adoc +++ b/en-US/sysadmin_user_stories/assembly-verifying_file_permissions.adoc @@ -1,4 +1,5 @@ -[#verifying-file-permissions] +:assembly: verifying_file_permissions +[#{assembly}] = Verifying File Permissions This section describes how you can verify what the permissions for a directory are file so that you can make sure which user or user group can access which files or directories. You can also verify what files or directories you can access. diff --git a/en-US/sysadmin_user_stories/concept-selinux_and_mariadb_or_postgresql.adoc b/en-US/sysadmin_user_stories/concept-selinux_and_mariadb_or_postgresql.adoc index 72b852e..93ac6bc 100644 --- a/en-US/sysadmin_user_stories/concept-selinux_and_mariadb_or_postgresql.adoc +++ b/en-US/sysadmin_user_stories/concept-selinux_and_mariadb_or_postgresql.adoc @@ -1,7 +1,7 @@ // Include an 'ID' that corresponds to the title of the assembly // The ID will be used as an anchor for linking to the title // Do not change the ID to make sure existing links keep working -[#concept_template_and_guidelines] +[#{assembly}-concept_template_and_guidelines] = Concept Template and Guidelines _In the title, include nouns that are used in the body text -- this helps readers and search engines find information quickly._ diff --git a/en-US/sysadmin_user_stories/concept-what_happens_when_a_new_user_is_created.adoc b/en-US/sysadmin_user_stories/concept-what_happens_when_a_new_user_is_created.adoc index 72b852e..93ac6bc 100644 --- a/en-US/sysadmin_user_stories/concept-what_happens_when_a_new_user_is_created.adoc +++ b/en-US/sysadmin_user_stories/concept-what_happens_when_a_new_user_is_created.adoc @@ -1,7 +1,7 @@ // Include an 'ID' that corresponds to the title of the assembly // The ID will be used as an anchor for linking to the title // Do not change the ID to make sure existing links keep working -[#concept_template_and_guidelines] +[#{assembly}-concept_template_and_guidelines] = Concept Template and Guidelines _In the title, include nouns that are used in the body text -- this helps readers and search engines find information quickly._ diff --git a/en-US/sysadmin_user_stories/concept-what_is_a_group.adoc b/en-US/sysadmin_user_stories/concept-what_is_a_group.adoc index 63000cf..29d6778 100644 --- a/en-US/sysadmin_user_stories/concept-what_is_a_group.adoc +++ b/en-US/sysadmin_user_stories/concept-what_is_a_group.adoc @@ -1,19 +1,9 @@ -// Include an 'ID' that corresponds to the title of the assembly -// The ID will be used as an anchor for linking to the title -// Do not change the ID to make sure existing links keep working - // locally defined replaceable :MAJOROS: Fedora -[#what_is_a_group] +[#{assembly}-what_is_a_group] = What Is a Group? -// Ideally, base the name of the file on the title to avoid confusion -// Use a consistent system for filenames and IDs, e.g.: -// * Only substitute spaces with underscores -// * Don't use any CAPS - -Groups are logical expressions of organization, tying users together for a common purpose. Users within a group share the same permissions to read, write, or execute files owned by that group. -Each group is associated with a _group ID_ (*GID*). +Groups are logical expressions of organization, tying users together for a common purpose. Users within a group share the same permissions to read, write, or execute files owned by that group. Each group is associated with a _group ID_ (*GID*). Additionally, {MAJOROS} supports _access control lists_ (*ACLs*) for files and directories which allow permissions for specific users outside of the owner to be set. For more information about this feature, see the link:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/System_Administrators_Guide/ch-Access_Control_Lists.html[_Access Control Lists_] chapter of the link:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/System_Administrators_Guide/index.html[_Red Hat Enterprise Linux 7 System Administrators Guide_]. diff --git a/en-US/sysadmin_user_stories/concept-what_is_a_user.adoc b/en-US/sysadmin_user_stories/concept-what_is_a_user.adoc index 2e6e207..06340d4 100644 --- a/en-US/sysadmin_user_stories/concept-what_is_a_user.adoc +++ b/en-US/sysadmin_user_stories/concept-what_is_a_user.adoc @@ -1,9 +1,4 @@ -// Include an 'ID' that corresponds to the title of the assembly -// The ID will be used as an anchor for linking to the title -// Do not change the ID to make sure existing links keep working - -[#concept_what_is_a_user] - +[#{assembly}-what_is_a_user] = What Is a User? Users can be either people (meaning accounts tied to physical users) or accounts which exist for specific applications to use. diff --git a/en-US/sysadmin_user_stories/procedure-adding_users_to_user_groups.adoc b/en-US/sysadmin_user_stories/procedure-adding_users_to_user_groups.adoc index 9e8f269..573844f 100644 --- a/en-US/sysadmin_user_stories/procedure-adding_users_to_user_groups.adoc +++ b/en-US/sysadmin_user_stories/procedure-adding_users_to_user_groups.adoc @@ -1,7 +1,4 @@ -// Include an 'ID' that corresponds to the title of the assembly -// The ID will be used as an anchor for linking to the title -// Do not change the ID to make sure existing links keep working -[#adding_users_to_user_groups] +[#{assembly}-adding_users_to_user_groups] = Adding Users to User Groups This procedure describes how to add a user to a user group with the `usermod` command. @@ -10,7 +7,7 @@ This procedure describes how to add a user to a user group with the `usermod` co . Add users to the your new user group: + -[subs="quotes, macros"] +[subs="+quotes"] ---- usermod -aG myproject _username_ ---- diff --git a/en-US/sysadmin_user_stories/procedure-changing_file_permissions.adoc b/en-US/sysadmin_user_stories/procedure-changing_file_permissions.adoc index 5897039..976fc39 100644 --- a/en-US/sysadmin_user_stories/procedure-changing_file_permissions.adoc +++ b/en-US/sysadmin_user_stories/procedure-changing_file_permissions.adoc @@ -1,7 +1,7 @@ // Include an 'ID' that corresponds to the title of the assembly // The ID will be used as an anchor for linking to the title // Do not change the ID to make sure existing links keep working -[#doing_one_procedure] +[#{assembly}-doing_one_procedure] = Doing One Procedure _Start the title with a verb form, such as Creating or Create._ diff --git a/en-US/sysadmin_user_stories/procedure-chown_chmod_on_directory_for_user_group.adoc b/en-US/sysadmin_user_stories/procedure-chown_chmod_on_directory_for_user_group.adoc index 04cb3c1..9706b26 100644 --- a/en-US/sysadmin_user_stories/procedure-chown_chmod_on_directory_for_user_group.adoc +++ b/en-US/sysadmin_user_stories/procedure-chown_chmod_on_directory_for_user_group.adoc @@ -1,7 +1,4 @@ -// Include an 'ID' that corresponds to the title of the assembly -// The ID will be used as an anchor for linking to the title -// Do not change the ID to make sure existing links keep working -[#using_chown_and_chmod_on_a_directory_for_a_user_group] +[#{assembly}-using_chown_and_chmod_on_a_directory_for_a_user_group] = Using `chown` and `chmod` on a Directory for a User Group This procedure describes how to ensure that all members of a group can create and edit files in a directory. diff --git a/en-US/sysadmin_user_stories/procedure-creating_a_directory.adoc b/en-US/sysadmin_user_stories/procedure-creating_a_directory.adoc index bf78f0c..9d2f75e 100644 --- a/en-US/sysadmin_user_stories/procedure-creating_a_directory.adoc +++ b/en-US/sysadmin_user_stories/procedure-creating_a_directory.adoc @@ -1,7 +1,4 @@ -// Include an 'ID' that corresponds to the title of the assembly -// The ID will be used as an anchor for linking to the title -// Do not change the ID to make sure existing links keep working -[#creating_a_directory] +[#{assembly}-creating_a_directory] = Creating a Directory The `mkdir` command creates a directory. diff --git a/en-US/sysadmin_user_stories/procedure-creating_a_user_group.adoc b/en-US/sysadmin_user_stories/procedure-creating_a_user_group.adoc index 3870a2a..06fe29c 100644 --- a/en-US/sysadmin_user_stories/procedure-creating_a_user_group.adoc +++ b/en-US/sysadmin_user_stories/procedure-creating_a_user_group.adoc @@ -1,7 +1,4 @@ -// Include an 'ID' that corresponds to the title of the assembly -// The ID will be used as an anchor for linking to the title -// Do not change the ID to make sure existing links keep working -[#creating_a_user_group] +[#{assembly}-creating_a_user_group] = Creating a User Group This procedure describes how to create a group with the `groupadd` command. @@ -10,7 +7,7 @@ This procedure describes how to create a group with the `groupadd` command. . Create the `myproject` group by typing the following at a shell prompt as `root`: + -[subs="macros,quotes"] +[subs="+quotes"] ---- groupadd _options_ myproject ---- diff --git a/en-US/sysadmin_user_stories/procedure-enabling_password_aging.adoc b/en-US/sysadmin_user_stories/procedure-enabling_password_aging.adoc index cebce93..7f326bb 100644 --- a/en-US/sysadmin_user_stories/procedure-enabling_password_aging.adoc +++ b/en-US/sysadmin_user_stories/procedure-enabling_password_aging.adoc @@ -1,4 +1,4 @@ -[#enabling_password_aging] +[#{assembly}-enabling_password_aging] = Enabling Password Aging For security reasons, it is advisable to require users to change their passwords periodically. This can be done using the [command]`chage` command. diff --git a/en-US/sysadmin_user_stories/procedure-listing_files_in_a_directory.adoc b/en-US/sysadmin_user_stories/procedure-listing_files_in_a_directory.adoc index 5897039..976fc39 100644 --- a/en-US/sysadmin_user_stories/procedure-listing_files_in_a_directory.adoc +++ b/en-US/sysadmin_user_stories/procedure-listing_files_in_a_directory.adoc @@ -1,7 +1,7 @@ // Include an 'ID' that corresponds to the title of the assembly // The ID will be used as an anchor for linking to the title // Do not change the ID to make sure existing links keep working -[#doing_one_procedure] +[#{assembly}-doing_one_procedure] = Doing One Procedure _Start the title with a verb form, such as Creating or Create._ diff --git a/en-US/sysadmin_user_stories/procedure-navigating_to_a_file_or_a_directory.adoc b/en-US/sysadmin_user_stories/procedure-navigating_to_a_file_or_a_directory.adoc index 5897039..976fc39 100644 --- a/en-US/sysadmin_user_stories/procedure-navigating_to_a_file_or_a_directory.adoc +++ b/en-US/sysadmin_user_stories/procedure-navigating_to_a_file_or_a_directory.adoc @@ -1,7 +1,7 @@ // Include an 'ID' that corresponds to the title of the assembly // The ID will be used as an anchor for linking to the title // Do not change the ID to make sure existing links keep working -[#doing_one_procedure] +[#{assembly}-doing_one_procedure] = Doing One Procedure _Start the title with a verb form, such as Creating or Create._ diff --git a/en-US/sysadmin_user_stories/procedure-setting_passwords.adoc b/en-US/sysadmin_user_stories/procedure-setting_passwords.adoc index c0115a2..60401fd 100644 --- a/en-US/sysadmin_user_stories/procedure-setting_passwords.adoc +++ b/en-US/sysadmin_user_stories/procedure-setting_passwords.adoc @@ -1,4 +1,4 @@ -[#setting_passwords] +[#{assembly}-setting_passwords] = Setting Passwords For security reasons, it is advisable to require users to change their passwords periodically. diff --git a/en-US/sysadmin_user_stories/procedure-useradd.adoc b/en-US/sysadmin_user_stories/procedure-useradd.adoc index b12709f..07bf110 100644 --- a/en-US/sysadmin_user_stories/procedure-useradd.adoc +++ b/en-US/sysadmin_user_stories/procedure-useradd.adoc @@ -1,7 +1,7 @@ // Include an 'ID' that corresponds to the title of the assembly // The ID will be used as an anchor for linking to the title // Do not change the ID to make sure existing links keep working -[#adding_a_new_user] +[#{assembly}-adding_a_new_user] = Adding a New User This procedure describes how to create a new user with the `useradd` command. diff --git a/en-US/sysadmin_user_stories/procedure-viewing_selinux_context_of_a_database.adoc b/en-US/sysadmin_user_stories/procedure-viewing_selinux_context_of_a_database.adoc index 5897039..976fc39 100644 --- a/en-US/sysadmin_user_stories/procedure-viewing_selinux_context_of_a_database.adoc +++ b/en-US/sysadmin_user_stories/procedure-viewing_selinux_context_of_a_database.adoc @@ -1,7 +1,7 @@ // Include an 'ID' that corresponds to the title of the assembly // The ID will be used as an anchor for linking to the title // Do not change the ID to make sure existing links keep working -[#doing_one_procedure] +[#{assembly}-doing_one_procedure] = Doing One Procedure _Start the title with a verb form, such as Creating or Create._ diff --git a/en-US/sysadmin_user_stories/reference-chage_command-line_options.adoc b/en-US/sysadmin_user_stories/reference-chage_command-line_options.adoc index 6dd564b..2f5ff90 100644 --- a/en-US/sysadmin_user_stories/reference-chage_command-line_options.adoc +++ b/en-US/sysadmin_user_stories/reference-chage_command-line_options.adoc @@ -1,10 +1,10 @@ -[#chage_command-line_options] +[#{assembly}-chage_command-line_options] = chage Command-line Options When the [command]`chage` command is followed directly by a username (that is, when no command-line options are specified), it displays the specified user's current password-aging values and allows you to change these values interactively. -[#table-chage-options] -.chage command line options +[#table-chage_options] +.Common `chage` command line options [options="header",cols="1,8"] |=== |Option|Description diff --git a/en-US/sysadmin_user_stories/reference-groupadd_command-line-options.adoc b/en-US/sysadmin_user_stories/reference-groupadd_command-line-options.adoc index dc21153..e430267 100644 --- a/en-US/sysadmin_user_stories/reference-groupadd_command-line-options.adoc +++ b/en-US/sysadmin_user_stories/reference-groupadd_command-line-options.adoc @@ -1,5 +1,8 @@ -[[table-groupadd-options]] -.Common groupadd command-line options +[#{assembly}-groupadd_command-line_options] += groupadd Command-line Options + +[#table-groupadd_options]] +.Common `groupadd` command-line options [options="header"] |=== |Option|Description diff --git a/en-US/sysadmin_user_stories/reference-permission_types.adoc b/en-US/sysadmin_user_stories/reference-permission_types.adoc index d040579..6338b2a 100644 --- a/en-US/sysadmin_user_stories/reference-permission_types.adoc +++ b/en-US/sysadmin_user_stories/reference-permission_types.adoc @@ -1,7 +1,7 @@ // Include an 'ID' that corresponds to the title of the assembly // The ID will be used as an anchor for linking to the title // Do not change the ID to make sure existing links keep working -[#reference_template_and_guidelines] +[#{assembly}-reference_template_and_guidelines] = Reference Template and Guidelines _In the title, include nouns that are used in the body text — this helps readers and search engines find information quickly._ diff --git a/en-US/sysadmin_user_stories/reference-useradd_command_line_options.adoc b/en-US/sysadmin_user_stories/reference-useradd_command_line_options.adoc index 38ff15d..39be147 100644 --- a/en-US/sysadmin_user_stories/reference-useradd_command_line_options.adoc +++ b/en-US/sysadmin_user_stories/reference-useradd_command_line_options.adoc @@ -1,5 +1,5 @@ -[#common_useradd_command-line_options] -= Common `useradd` Command-line Options +[#{assembly}-useradd_command-line_options] += useradd Command-line Options [[table-useradd-options]] .Common `useradd` command-line options diff --git a/index.adoc b/index.adoc index 2c6bc85..79b57f1 100644 --- a/index.adoc +++ b/index.adoc @@ -1,3 +1,6 @@ +:toc: +:numbered: + [#sysadmin_user_stories] = SysAdmin User Stories