diff --git a/docs/images/regenerate_deploy_key_1.png b/docs/images/regenerate_deploy_key_1.png new file mode 100644 index 000000000..6319e5cb6 Binary files /dev/null and b/docs/images/regenerate_deploy_key_1.png differ diff --git a/docs/images/regenerate_deploy_key_2.png b/docs/images/regenerate_deploy_key_2.png new file mode 100644 index 000000000..1c20e033b Binary files /dev/null and b/docs/images/regenerate_deploy_key_2.png differ diff --git a/docs/setup/enc.md b/docs/setup/enc.md deleted file mode 100644 index d976c59cc..000000000 --- a/docs/setup/enc.md +++ /dev/null @@ -1,36 +0,0 @@ -## External Node Classifier (ENC) - -### Overview - -The ENC (`puppet_enc.rb`) is the script that Puppet Server calls to determine -a node's environment, parameters, and tags. It is configured in `puppet.conf`: - -```ini -[server] -node_terminus = exec -external_nodes = /etc/puppetlabs/code/environments/production/puppet_enc.rb -``` - -### Why the ENC lives on the production branch - -Each environment under `/etc/puppetlabs/code/environments/` is a full git -clone checked out at a specific tag (e.g. `v1_5_3`). Puppet Server's -`external_nodes` setting points to a **single, fixed path** — it cannot -dynamically select an ENC per environment. - -Because of this, `puppet_enc.rb` always runs from the `production` environment. -It calls the API to determine the node's actual environment (via -`linuxaid_tag`), and returns it in the YAML output. Puppet Server then uses -that environment to load the correct `environment.conf`, modulepath, and Hiera -data from the corresponding environment directory. - -If the ENC needs to be fixed or updated, only the `production` environment's -copy needs to change — making it a single point of maintenance. - -### Branch naming: master == production - -The `master` branch in git corresponds to the `production` environment on the -Puppet Server. This mapping is handled by `gfetch`, which clones/checks out -the `master` branch into the `production` environment directory. When a node -has no `linuxaid_tag` set (or the tag is empty), the ENC falls back to the -`production` environment. diff --git a/docs/setup/git_setup.md b/docs/setup/git_setup.md index 2961ab1a9..41ec233b8 100644 --- a/docs/setup/git_setup.md +++ b/docs/setup/git_setup.md @@ -27,6 +27,14 @@ ![Linuxaid Deploy Key 1](../images/linuxaid_deploy_key_1.png) ![Linuxaid Deploy Key 2](../images/linuxaid_deploy_key_2.png) +### Deploy Key Already Generated + +If you have already created one deploy key, and want to re-generate it, you can do so. +It will invalidate the previous one. + +![Regenrate Deploy Key 1](../images/regenerate_deploy_key_1.png) +![Regenrate Deploy Key 2](../images/regenerate_deploy_key_2.png) + ## Phase 2: Configure in your Git Repository 1. **Add Deploy Key:** In your `linuxaid-config` repository, go to **Settings** > **Deploy keys** > **Add deploy key**. diff --git a/docs/setup/linuxaid_config.md b/docs/setup/linuxaid_config.md deleted file mode 100644 index 881595bb6..000000000 --- a/docs/setup/linuxaid_config.md +++ /dev/null @@ -1,7 +0,0 @@ -## LinuxAid Config Setup - -* Fork the template repo of linuxaid-config or simply setup a new one. - -```sh -git clone https://github.com/Obmondo/linuxaid-config-template.git -``` diff --git a/docs/setup/openvox_agent.md b/docs/setup/openvox_agent.md deleted file mode 100644 index 6fc078687..000000000 --- a/docs/setup/openvox_agent.md +++ /dev/null @@ -1,41 +0,0 @@ -# LinuxAid Agent - -## Setup - -* Install [Puppet agent](https://help.puppet.com/core/current/Content/PuppetCore/install_nix_agents.htm) - -``` -# Redhat -sudo yum install puppet-agent - -# Debian -sudo apt-get install puppet-agent -``` - -* Setup puppet.conf - -``` -cat /etc/puppetlabs/puppet/puppet.conf -[main] - server = - certname = - masterport = 8140 - environment = production - runinterval = 30m - strict_variables = true - manage_internal_file_permissions = false - runtimeout = 20m - -[agent] -report = true -noop = false -graph = true -splaylimit = 60s -splay = true -``` - -* Run puppet agent - -``` -puppet agent -t --noop -```