From 59ad80bda733186770b3ffdd5ab49ac434cf1031 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Sat, 31 Aug 2019 03:01:59 -0400 Subject: [PATCH] README fixes --- README.md | 46 ++++++++++++++++++---------------- ansible/README.md | 8 +++--- ansible/roles/README.md | 18 ++++++------- ansible/roles/core/README.md | 20 +++++++-------- ansible/roles/docker/README.md | 2 ++ ansible/roles/nginx/README.md | 2 +- scripts/README.md | 19 ++++++++------ 7 files changed, 61 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index 4fa3f37..afd6bad 100644 --- a/README.md +++ b/README.md @@ -40,46 +40,48 @@ klips/ └── setup-vim.sh ``` -ansible - Ansible roles, playbooks +### ansible + +Ansible roles, playbooks - apt-up.yml - Playbook to update servers / groups ad hoc - core.yml - Playbook example for using core configuration role - docker.yml - Playbook example for using docker install role (Debian / Ubuntu) - - hosts - Same ansible hosts file + - hosts - Sample / partially default ansible hosts file - make-host.yml - Playbook example for using multiple roles together to create a new host - nginx.yml - Playbook example for using nginx role - roles - Some simple Ansible roles created with `ansible-galaxy init --offline` command - -- core - Role to configure a new host with basic authentication / package settings - -- docker - Role to install docker, docker-compose, configure docker user group (Debian / Ubuntu) - -- nginx - Role to install and configure a new nginx webserver on a host + - core - Role to configure a new host with basic authentication / package settings + - docker - Role to install docker, docker-compose, configure docker user group (Debian / Ubuntu) + - nginx - Role to install and configure a new nginx webserver on a host -configs +### configs - .vimrc - Various settings for vim, can be copied or used with setup-vim.sh) - .vimrc-README - What these settings do, output when setup-vim.sh is ran.) -plates +### plates - cpp-cmake - Simple cpp executable template, built using cmake - cpp-launcher - Simple cpp launcher template, built using cmake. Easily expandable. -refs +### refs - doxygenROT - Basic rule-of-thumb for Doxygen commenting -scripts +### scripts - adduser.sh - Script to add new user, run with sudo if you want to configure / allow user to sudo - -- ./adduser - (Print help text) - -- ./adduser - (Don't need sudo if new user doesn't need it) - -- sudo ./adduser - -- sudo ./adduser jeff 1005 - (Create jeff user and assign userID to 1005) - -- Follow prompts to configure password / sudo depending on needs of new user + - ./adduser - (Print help text) + - ./adduser - (Don't need sudo if new user doesn't need it) + - sudo ./adduser + - sudo ./adduser jeff 1005 - (Create jeff user and assign userID to 1005) + - Follow prompts to configure password / sudo depending on needs of new user - cmake-build.sh - Script to toss around and build cmake projects - README.md - Further clarification of scripts - setup-vim.sh - Script for setting up vim configuration - -- Includes Pathogen Plugin manager - -- Includes auto-completion (Clang_completion) - -- Supertab completion interaction (Tab to interact with completion context) - -- Syntax highlighting - -- Tabsize 2, use spaces in place of tabs - -- auto indentation, mouse interaction when supported - -- Custom keybind (Ctrl-e for jumping windows || Ctrl-w still works if not in a tabbed terminal where the same will close the tab) - -- See klips/configs/.vimrc-README for more information + - Includes Pathogen Plugin manager + - Includes auto-completion (Clang_completion) + - Supertab completion interaction (Tab to interact with completion context) + - Syntax highlighting + - Tabsize 2, use spaces in place of tabs + - auto indentation, mouse interaction when supported + - Custom keybind (Ctrl-e for jumping windows || Ctrl-w still works if not in a tabbed terminal where the same will close the tab) + - See klips/configs/.vimrc-README for more information diff --git a/ansible/README.md b/ansible/README.md index 3fa6843..3063d8e 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -6,13 +6,13 @@ Playbooks - apt-up.yml - Playbook to update servers / groups ad hoc - core.yml - Playbook example for using core configuration role - docker.yml - Playbook example for using docker install role (Debian / Ubuntu) - - hosts - Same ansible hosts file + - hosts - Sample / partially default ansible hosts file - make-host.yml - Playbook example for using multiple roles together to create a new host - nginx.yml - Playbook example for using nginx role Roles - roles - Basic ansible role created with ansible-galaxy command - -- core - Role to configure a new host with basic authentication / package settings - -- docker - Role to install docker, docker-compose, configure docker user group (Debian / Ubuntu) - -- nginx - Role to install and configure a new nginx webserver on a host + - core - Role to configure a new host with basic authentication / package settings + - docker - Role to install docker, docker-compose, configure docker user group (Debian / Ubuntu) + - nginx - Role to install and configure a new nginx webserver on a host diff --git a/ansible/roles/README.md b/ansible/roles/README.md index 547946a..9c82b94 100644 --- a/ansible/roles/README.md +++ b/ansible/roles/README.md @@ -3,9 +3,9 @@ Some simple Ansible roles created with `ansible-galaxy init --offline` command klips/ansible/roles/... - -- core - Role to configure a new host with basic authentication / package settings - -- docker - Role to install docker, docker-compose, configure docker user group - -- nginx - Role to install and configure a new nginx webserver on a host + - core - Role to configure a new host with basic authentication / package settings + - docker - Role to install docker, docker-compose, configure docker user group + - nginx - Role to install and configure a new nginx webserver on a host All of these roles assume you are using the apt package manager, and running a Debian / Ubuntu system. @@ -16,14 +16,14 @@ A simple role for configuring a set of packages / settings on a new Ubuntu host Packages Added / Configured - Git - -- Configure / set user name and email + - Configure / set user name and email - SSH - -- MOTD (Template, replacable, displayed on login.) - -- PAM (Template, replacable, authusers file to bypass) - -- authusers (Add users to file to bypass PAM settings) + - MOTD (Template, replacable, displayed on login.) + - PAM (Template, replacable, authusers file to bypass) + - authusers (Add users to file to bypass PAM settings) - Vim - -- Install Vim - -- Run https://github.com/shaunrd0/klips/scripts/setup-vim.sh + - Install Vim + - Run https://github.com/shaunrd0/klips/blob/master/scripts/setup-vim.sh docker diff --git a/ansible/roles/core/README.md b/ansible/roles/core/README.md index ab44bc7..2cfbb5f 100644 --- a/ansible/roles/core/README.md +++ b/ansible/roles/core/README.md @@ -5,14 +5,14 @@ A simple role for configuring a set of packages / settings on a new Ubuntu host Packages Added / Configured - Git - -- Configure / set user name and email + - Configure / set user name and email - SSH - -- MOTD (Template, replacable, displayed on login.) - -- PAM (Template, replacable, authusers file to bypass) - -- authusers (Add users to file to bypass PAM settings) + - MOTD (Template, replacable, displayed on login.) + - PAM (Template, replacable, authusers file to bypass) + - authusers (Add users to file to bypass PAM settings) - Vim - -- Install Vim - -- Run https://github.com/shaunrd0/klips/scripts/setup-vim.sh + - Install Vim + - Run https://github.com/shaunrd0/klips/scripts/setup-vim.sh Requirements ------------ @@ -34,23 +34,23 @@ hostname: "localhost" domain_name: "www.localhost.com" ``` -Basic package installation variable - +#### Basic package installation variable - packages - A list of packages to install when running core configuration. Add package to this list and it will be installed on your new host. Further configuration will need to be done manually, unless the role is modified otherwise. -SSH Configuration Variables - +#### SSH Configuration Variables - ssh_port - The port to configure SSH to listen on auth_methods - Authentication methods to allow SSH base configuration to use. Otherwise, specify a match within the sshd_config -MOTD Configuration Variables - +#### MOTD Configuration Variables - hostname - The hostname of the box you are using, used in the MOTD for a host-specific greeting, so you know which host you are logged into when glancing between terminals. domain_name - The domain name, if available, associated with this host. -Git Configuration Variables - +#### Git Configuration Variables - git_email - Email address to configure with Git diff --git a/ansible/roles/docker/README.md b/ansible/roles/docker/README.md index 74d6d3b..53b4bde 100644 --- a/ansible/roles/docker/README.md +++ b/ansible/roles/docker/README.md @@ -17,6 +17,8 @@ Found in `.../roles/docker/defaults/main.yml` docker_users: [user1, user2] ``` +#### Docker Group Configuration Variable - + docker_users - A list of users to configure / add to the docker group Example Playbook diff --git a/ansible/roles/nginx/README.md b/ansible/roles/nginx/README.md index 5842fc7..a99cdf4 100644 --- a/ansible/roles/nginx/README.md +++ b/ansible/roles/nginx/README.md @@ -19,7 +19,7 @@ nginx_root_dir: "/var/www/html/" index_files: "index.html index.htm" ``` -NGINX Configuration Variables - +#### NGINX Configuration Variables - domain_name - Domain name to be used in nginx.conf, default value is the same as nginx base package default setting (localhost) diff --git a/scripts/README.md b/scripts/README.md index 9512079..ebc9975 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -4,27 +4,30 @@ I write these scripts for my own use, and you may need to tweak them slightly to Never run a script you can't read or understand. Comments can be found in the scripts, usually explaining them block-by-block. Below is my personal use cases for the scripts, to provide further insight into how I use them and how they might be useful to you. -#### adduser.sh +adduser.sh +------------ This script was made on Ubuntu when creating a few users across multiple hosts. Syntax requires at least 2 arguments when running the script, otherwise help text will be output warning of correct usage and available options. The script can be used to configure sudo on a new user if the script itself is ran with sudo. Otherwise, creating a default user with or without a password is possible without sudo. If the script is ran on an existing user or a userID that is already in use is passed, no changes will happen in user-creation but you may still allow the user to sudo and change their password. Syntax - -./adduser (Help text) -./adduser jeff 1005 (Create user jeff with userID 1005, can't configure sudo, prompt for possible password creation) +`./adduser` (Help text) +`./adduser jeff 1005` (Create user jeff with userID 1005, can't configure sudo, prompt for possible password creation) -sudo ./adduser (Help text) -sudo ./adduser jeffy 1010 (Create user jeffy with userID 1010, can configure sudo, possible password creation) +`sudo ./adduser` (Help text) +`sudo ./adduser jeffy 1010` (Create user jeffy with userID 1010, can configure sudo, possible password creation) Didn't configure sudo, and don't want to do so manually? Re-run the script on the existing user just as above, and accept the prompt for sudo configuration. -sudo ./adduser jeff 1005 (User creation will fail, follow prompts to configure sudo and / or reset user password) +`sudo ./adduser jeff 1005` (User creation will fail, follow prompts to configure sudo and / or reset user password) -#### cmake-build.sh +cmake-build.sh +------------ I usually run this script within whatever directory I'm working in, hence the infinite loop, I leave the script running until I'm done with my work and move to a new directory / cmake project. -#### setup-vim.sh +setup-vim.sh +------------ To use this script, copy it to a safe directory where we can store previous / future vimrc configurations and run it as a user with sudo privelages. See below for example commands and output.