Merge pull request #134 from cmckee786/ansible-feat

fix: port over changes from lac

Author: kolkhis

src/assets/deploy/ansible-playbook.yml

@@ -1,66 +1,104 @@
 ---
-- name: Deploy local ProLUG mdBook dev page to rocky container
-  hosts: { host }
-  gather_facts: false
+- name: Deploy local ProLUG mdBook dev page machine/container
+  hosts: # change targeted host/hosts here
   become: true
+  gather_facts: true
 
   tasks:
-    - name: Install dependencies
-      ansible.builtin.package:
-        update_cache: true
-        name:
-          - { httpd or apache2 }
-          - git
-          - gcc
-          - rust
-          - cargo
-        state: present
+    - name: Build ProLUG website for DNF Systems
+      when: ansible_pkg_mgr == "dnf"
+      block:
+        - name: Install and initialize dependencies
+          ansible.builtin.package:
+            update_cache: true
+            name:
+              - httpd
+              - git
+              - gcc
+              - rust
+              - cargo
+            state: present
 
-    - name: Enable httpd or apache2
-      ansible.builtin.service:
-        name: { httpd or apache2 }
-        enabled: true
+        - name: Initialize httpd
+          ansible.builtin.service:
+            name: httpd
+            state: started
+            enabled: true
+
+        - name: DNF - Installing mdbook
+          community.general.cargo:
+            name: mdbook
+            locked: true
+            state: present
+
+    - name: Build ProLUG website for APT systems
+      when: ansible_pkg_mgr == "apt"
+      block:
+        - name: Install dependencies apt
+          ansible.builtin.package:
+            update_cache: true
+            name:
+              - apache2
+              - git
+              - gcc
+              - rustc-1.80
+              - cargo-1.80
+            state: present
+
+        - name: Initialize apache2
+          ansible.builtin.service:
+            name: apache2
+            state: started
+            enabled: true
 
-    - name: Installing mdbook
-      community.general.cargo:
-        name: mdbook
-        locked: true
-        state: present
+        - name: APT - Installing mdbook
+          ansible.builtin.command:
+            argv:
+              - /usr/bin/cargo-1.80
+              - install
+              - --locked
+              - [email protected]
 
     - name: Verifying presence of ProLUG repo
       ansible.builtin.command: ls /root/psc/
       register: contents_git
       ignore_errors: true
 
-    - name: Clone down ProLUG repo if absent
+    - name: Cloning down ProLUG repo
       ansible.builtin.git:
         repo: "https://github.com/ProfessionalLinuxUsersGroup/psc"
         dest: /root/psc/
         clone: true
       when: contents_git.stdout == ""
 
-    - name: Verify absent httpd configuration
-      ansible.builtin.command: ls /var/www/html/
-      register: contents_httpd
-
-    - name: Checking /var/www/html not empty
-      ansible.builtin.debug:
-        msg: "httpd /html not empty, verify content"
-      when: contents_httpd.stdout != ""
+    - name: DNF - Building mdbook
+      ansible.builtin.command:
+        chdir: /root/psc
+        argv:
+          - /root/.cargo/bin/mdbook
+          - build
+          - --dest-dir
+          - /var/www/html
+      when: ansible_pkg_mgr == "dnf"
+      notify: Restart httpd
 
-    - name: Builing mdbook if /html empty
+    - name: APT - Building mdbook
       ansible.builtin.command:
         chdir: /root/psc
         argv:
           - /root/.cargo/bin/mdbook
           - build
           - --dest-dir
           - /var/www/html
-      when: contents_httpd.stdout == ""
-      notify: Restart httpd or apache2
+      when: ansible_pkg_mgr == "apt"
+      notify: Restart apache2
 
   handlers:
-    - name: Restart httpd or apache2
+    - name: Restart httpd
+      ansible.builtin.service:
+        name: httpd
+        state: restarted
+    - name: Restart apache2
       ansible.builtin.service:
-        name: { httpd or apache2 }
+        name: apache2
         state: restarted

src/development.md

@@ -17,7 +17,7 @@ technologies as Ansible, containers, bash scripts, and more.
 
 ---
 
-The ProLUG Security Course (PSC) utilizes [mdBook](https://github.com/rust-lang/mdBook)
+The ProLUG Security Course (psc) utilizes [mdBook](https://github.com/rust-lang/mdBook)
 (markdown Book), a friendly and popular markdown utility that quickly exports
 files and web structures for documentation or general website use cases.
 
@@ -32,7 +32,7 @@ Below is the current workflow that deploys the Git Page for the course:
 
 </div>
 
-To achieve this workflow locally the following environment and dependencies are
+To achieve this deployment locally the following environment and dependencies are
 required:
 
 <dl>
@@ -60,12 +60,11 @@ environments if things go awry.
 <https://github.com/ProfessionalLinuxUsersGroup/psc/blob/main/src/assets/deploy/ansible-playbook.yml>
 
 To use this playbook, your machine(s)/containers must be configured correctly for Ansible.
-If you don't know the requirements to administer a machine via Ansible, documentation
+If you don't know the requirements to administer a machine via Ansible documentation
 has been provided below.
 
 <div class = warning>
-This playbook will need to be modified based on which distribution or package management
-tool is configured.
+This playbook attempts to install and initialize dependencies based on APT and DNF package managers only.
 </div>
 
 Getting started with Ansible:  
@@ -95,29 +94,29 @@ Tested with Rocky 9 and Ubuntu 24.04 Containers.
 APT frontends:
 
 ```bash
-#!/bin/bash
+#!/usr/bin/env bash
 apt-get update
 apt-get -y install apache2 git gcc rustc-1.80 cargo-1.80
-cargo-1.80 install --locked mdbook
-systemctl enable apache2 && systemctl start apache2
+cargo-1.80 install --locked mdbook@0.4.48
+systemctl enable --now apache2
 cd && git clone https://github.com/ProfessionalLinuxUsersGroup/psc
 echo 'PATH=$PATH:~/.cargo/bin/' | tee -a ~/.profile
-export PATH=$PATH:~/.cargo/bin/ && echo $PATH
+export PATH=$PATH:~/.cargo/bin/ && echo $PATH | grep cargo
 cd ~/psc && mdbook build -d /var/www/html
 systemctl restart apache2
 ```
 
 DNF frontends:
 
 ```bash
-#!/bin/bash
+#!/usr/bin/env bash
 dnf update
 dnf install -y httpd git gcc rust cargo
 cargo install --locked mdbook
-systemctl enable httpd && systemctl start httpd
+systemctl enable --now httpd
 cd && git clone https://github.com/ProfessionalLinuxUsersGroup/psc
 echo 'PATH=$PATH:~/.cargo/bin/' | tee -a ~/.bash_profile
-export PATH=$PATH:~/.cargo/bin/ && echo $PATH
+export PATH=$PATH:~/.cargo/bin/ && echo $PATH | grep cargo
 cd ~/psc && mdbook build -d /var/www/html
 systemctl restart httpd
 ```
@@ -138,8 +137,8 @@ From there you should be able to see any changes you have made are reflected.
 
 #### Or send commands over to a networked container or machine:
 
-**Note:** To minimize complexity and given the nature of commands over SSH, these
-commands will need to utilize absolute paths.
+**Note:** To minimize complexity and given the nature of commands over SSH,
+these commands will need to utilize absolute paths.
 
 ```bash
 scp {working directory}/{targeted document} {TARGET_IP}:/root/psc/src/{targeted document}