Merge branch 'automated-tasks' into 'development'

chore(gitlab-ci): Automated update of git sub-module

See merge request nofusscomputing/projects/docker-glpi!42

.cz.yaml

@@ -4,4 +4,4 @@ commitizen:
   name: cz_conventional_commits
   tag_format: $major.$minor.$patch$prerelease
   update_changelog_on_bump: true
-  version: 0.1.0rc0
+  version: 0.7.0

.gitlab-ci.yml

@@ -7,7 +7,7 @@ variables:
   DOCKER_IMAGE_PUBLISH_NAME: 'docker-glpi'
   DOCKER_IMAGE_PUBLISH_REGISTRY: docker.io/nofusscomputing
   DOCKER_IMAGE_PUBLISH_URL: https://hub.docker.com/r/nofusscomputing/$DOCKER_IMAGE_PUBLISH_NAME
-  PAGES_ENVIRONMENT_PATH: projects/docker_glpi/
+  PAGES_ENVIRONMENT_PATH: projects/glpi/
 
 include:
   - project: nofusscomputing/projects/gitlab-ci
@@ -15,3 +15,25 @@ include:
     file:
       - template/automagic.gitlab-ci.yaml
   #- template: Jobs/Container-Scanning.gitlab-ci.yml # see https://gitlab.com/gitlab-org/gitlab/-/issues/381665
+
+
+Website.Submodule.Deploy:
+  extends: .submodule_update_trigger
+  variables:
+    SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/infrastructure/website
+  environment:
+    url: https://nofusscomputing.com/$PAGES_ENVIRONMENT_PATH
+    name: Documentation
+  rules:
+    - if:  # condition_dev_branch_push
+        $CI_COMMIT_BRANCH == "development" && 
+        $CI_PIPELINE_SOURCE == "push"
+      exists:
+        - '{docs/**,pages/**}/*.md'
+      changes:
+        paths:
+          - '{docs/**,pages/**}/*.md'
+        compare_to: 'master'
+      when: always
+
+    - when: never

.gitmodules

@@ -2,3 +2,7 @@
 	path = gitlab-ci
 	url = https://gitlab.com/nofusscomputing/projects/gitlab-ci.git
 	branch = development
+[submodule "website-template"]
+	path = website-template
+	url = https://gitlab.com/nofusscomputing/infrastructure/website-template.git
+	branch = development

CHANGELOG.md

@@ -1,3 +1,75 @@
+## 0.7.0 (2024-08-01)
+
+### Features
+
+- [01d78e0b](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/01d78e0bfb32aee9701379f1cb96f971100d1946) - Bump GLPI version 10.0.15 -> 10.0.16 [ [!34](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/34) ]
+
+## 0.6.0 (2024-05-31)
+
+### Features
+
+- [ec51bf83](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/ec51bf8328a5be9f589b314a2c38b9c213127dcb) - Bump GLPI version 10.0.14 -> 10.0.15 [ [!34](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/34) ]
+
+## 0.5.0 (2024-03-27)
+
+### Features
+
+- [0ccc5eec](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/0ccc5eec3de8773fde1c9cbf0b85ecb3ce66d1c8) - Bump base image debian-bullseye -> debian-bookworm [ [!32](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/32) ]
+- [7c6cc8f9](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/7c6cc8f9736246f62ad7c677a1361a96a4520c0f) - Bump GLPI version 10.0.12 -> 10.0.14 [ [!32](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/32) ]
+- [816c6307](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/816c6307605be92c396f1c3eaabedd414fe56c83) - add custom theme 'nfc' [ [!32](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/32) ]
+
+## 0.4.0 (2024-02-01)
+
+### Features
+
+- [0f9b2038](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/0f9b203815e69156fbbd538edf19cf7f22654e4d) - Bump GLPI version to 10.0.12 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
+
+## 0.3.0 (2024-01-09)
+
+### Features
+
+- **php**: [dffc7014](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/dffc70141f46cf7f719aa928bd76aa4e55b67a0d) - Bumped to version 8.2 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
+- **glpi**: [4820e30d](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/4820e30d551d904d4781e503ca2c8adb7a336fbd) - Bumped to version 10.0.11 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
+
+## 0.2.0 (2023-10-28)
+
+### Features
+
+- **glpi**: [a50e33cb](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/a50e33cbc96b2d6791f8ae288e1beea88a459f38) - Bumped to version 10.0.10 [ [!7](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/7) ]
+
+## 0.1.0 (2023-08-30)
+
+### Bug Fixes
+
+- **dockerfile**: [68851755](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/688517556a748c2ac74d657d573b4ee79a1e48d3) - ensure CA certs available prior to apt install [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) ]
+- **dockerfile**: [5884c49f](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/5884c49f8aacfc25e5b79e1fe1edb745891b9c85) - silently fail if file doesn't exist on delete [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) [#3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/3) ]
+
+### Code Refactor
+
+- **docker**: [1973f5e0](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/1973f5e00358be11e2c82ea0fdfb0f32430fa0b6) - dockerfile move php version to arg [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) [#3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/3) ]
+
+### Features
+
+- **php**: [6278fbb3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/6278fbb3dce77dc01dedcb4cefa91b428eaa9135) - upgrade php to 8.1 [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) [#3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/3) ]
+
+## 0.1.0rc1 (2023-08-30)
+
+### Bug Fixes
+
+- **docker**: [83fbaae1](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/83fbaae1d61bcd9ac73f46373694204c5e7751c8) - added files as volume [ [!3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/3) ]
+
+### Documentaton / Guides
+
+- [711549ba](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/711549ba4c9709c39022d8e87e401f5184637091) - add docker-compose example [ [!3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/3) [#2](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/2) ]
+- [39e47638](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/39e476386a4a88fa6fa175f14085eb0cc3e8e4e4) - add cron [ [!3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/3) [#2](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/2) ]
+- [23886773](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/23886773af9976a06be6296cc4a89986df0cd787) - added initial docs [ [!3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/3) [#2](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/2) ]
+
+### Features
+
+- **inventory**: [04999a8b](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/04999a8b57837d3f30a7df40323b82b4ebb0387b) - Authenticated access [ [!3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/3) [#4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/4) ]
+- **inventory**: [83b4e98a](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/83b4e98a189d50f5b69d25e8a02f0dee70f012e9) - Enable inventory endpoint with env variable [ [!3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/3) [#4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/4) ]
+- **inventory**: [3439d1e3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/3439d1e36184e83e01829db5c0ee97984b350a5a) - block access to inventory endpoints [ [#4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/4) ]
+
 ## 0.1.0rc0 (2023-07-16)
 
 ### Bug Fixes

README.md

@@ -8,6 +8,8 @@
 
 ![Project Status - Active](https://img.shields.io/badge/Project%20Status-Active-green?logo=gitlab&style=plastic) 
 
+[![Docker Pulls](https://img.shields.io/docker/pulls/nofusscomputing/docker-glpi?style=plastic&logo=docker&color=0db7ed)](https://hub.docker.com/r/nofusscomputing/docker-glpi) [![Artifact Hub](https://img.shields.io/endpoint?style=plastic&url=https://artifacthub.io/badge/repository/nfc-docker-glpi)](https://artifacthub.io/packages/search?repo=nfc-docker-glpi)
+
 <br>
 
 ![Gitlab forks count](https://img.shields.io/badge/dynamic/json?label=Forks&query=%24.forks_count&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F12928828%2F&color=ff782e&logo=gitlab&style=plastic) ![Gitlab stars](https://img.shields.io/badge/dynamic/json?label=Stars&query=%24.star_count&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F12928828%2F&color=ff782e&logo=gitlab&style=plastic) [![Open Issues](https://img.shields.io/badge/dynamic/json?color=ff782e&logo=gitlab&style=plastic&label=Open%20Issues&query=%24.statistics.counts.opened&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F12928828%2Fissues_statistics)](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues)

dockerfile

@@ -1,11 +1,13 @@
-ARG GLPI_VERSION=10.0.9
+ARG GLPI_VERSION=10.0.16
+ARG VERSION_PHP=8.2
 
-FROM debian:bullseye-slim as prepare
+FROM debian:bookworm-slim as prepare
 
 ARG GLPI_VERSION
+ARG VERSION_PHP
 
 ENV GLPI_VERSION $GLPI_VERSION
-
+ENV VERSION_PHP $VERSION_PHP
 # RUN echo "Acquire::http::Proxy \"http://192.168.1.172:3142\";\nAcquire::https::Proxy \"http://192.168.1.172:3142\";" > /etc/apt/apt.conf.d/apt_proxy.conf
 
 
@@ -31,19 +33,28 @@ RUN export GLPI_URL=$(curl -s https://api.github.com/repos/glpi-project/glpi/rel
   tar -xzf /tmp/${TAR_FILENAME} -C /tmp;
 
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
+
+LABEL \
+  org.opencontainers.image.vendor="No Fuss Computing" \
+  org.opencontainers.image.title="GLPI" \
+  org.opencontainers.image.description="GLPI Within a docker container" \
+  org.opencontainers.image.vendor="No Fuss Computing" \
+  io.artifacthub.package.license="MIT"
 
 
 ARG GLPI_VERSION
+ARG VERSION_PHP
 
 
 ENV DEBIAN_FRONTEND noninteractive
 
 ENV GLPI_VERSION $GLPI_VERSION
 
- 
+ENV VERSION_PHP $VERSION_PHP
+
 #COPY --from=prepare /etc/apt/apt.conf.d/apt_proxy.conf /etc/apt/apt.conf.d/apt_proxy.conf
-  
+
 COPY --from=prepare /usr/share/keyrings/deb.sury.org-php.gpg /usr/share/keyrings/deb.sury.org-php.gpg
 
 COPY --from=prepare /etc/apt/sources.list.d/php.list /etc/apt/sources.list.d/php.list
@@ -51,29 +62,33 @@ COPY --from=prepare /etc/apt/sources.list.d/php.list /etc/apt/sources.list.d/php
 
 RUN apt update; \
   apt install --no-install-recommends -y \
-    apache2 \
-    php7.4 \
-    php7.4-mysql \
-    php7.4-ldap \
-    php7.4-xmlrpc \
-    php7.4-imap \
-    php7.4-curl \
-    php7.4-gd \
-    php7.4-mbstring \
-    php7.4-xml \
-    php-cas \
-    php7.4-intl \
-    php7.4-zip \
-    php7.4-bz2 \
-    php7.4-redis \
+    ca-certificates \
     \
     cron \
-    supervisor \
-    ca-certificates; \
-    rm -rf /var/lib/apt/lists/*; \
-    rm -rf /var/www/html; \
-    rm /etc/apt/apt.conf.d/apt_proxy.conf; \
-    a2enmod rewrite;
+    supervisor; \
+  rm -rf /var/lib/apt/lists/*;
+
+RUN apt update; \
+  apt install --no-install-recommends -y \
+    apache2 \
+    php$VERSION_PHP \
+    php$VERSION_PHP-mysql \
+    php$VERSION_PHP-ldap \
+    php$VERSION_PHP-xmlrpc \
+    php$VERSION_PHP-imap \
+    php$VERSION_PHP-curl \
+    php$VERSION_PHP-gd \
+    php$VERSION_PHP-mbstring \
+    php$VERSION_PHP-xml \
+    php-cas \
+    php$VERSION_PHP-intl \
+    php$VERSION_PHP-zip \
+    php$VERSION_PHP-bz2 \
+    php$VERSION_PHP-redis; \
+  rm -rf /var/lib/apt/lists/*; \
+  rm -rf /var/www/html; \
+  rm -f /etc/apt/apt.conf.d/apt_proxy.conf; \
+  a2enmod rewrite;
 
 
 COPY --from=prepare /tmp/glpi /var/www/html
@@ -88,11 +103,15 @@ COPY --from=prepare /tmp/glpi /var/www/html
 
 
 RUN chown www-data:www-data -R /var/www; \
-  ln -s /var/www/html/bin/console /bin/console;
+  ln -s /var/www/html/bin/console /bin/console; \
+  touch /apache-passwd-glpi-inventory; \
+  chown www-data:www-data /apache-passwd-glpi-inventory; \
+  chmod 740 /apache-passwd-glpi-inventory;
 
 
 VOLUME /var/www/html/config
 VOLUME /var/www/html/data
+VOLUME /var/www/html/files
 VOLUME /var/www/html/plugins
 VOLUME /var/www/html/marketplacey
 VOLUME /var/log

docs/projects/glpi/index.md

@@ -0,0 +1,181 @@
+---
+title: Dockerized GLPI
+description: How to use No Fuss Computings docker container GLPI.
+date: 2023-08-29
+template: project.html
+about: https://gitlab.com/nofusscomputing/projects/ansible/docker-glpi
+---
+
+This docker container contains GLPI and is intended to be production ready and requires minimal configuration to use.
+
+!!! info
+    **TLDR** The docker container is available on dockerhub. `docker pull nofusscomputing/docker-glpi:dev`
+
+This container is designed to be ephemeral with all data residing within docker volumes. Outside of this container, the only reqirements is hard disk space and a MySQL/MariaDB database.
+
+
+## Features
+
+To see a full list of changes/features see the [changelog](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/blob/development/CHANGELOG.md).
+
+- Data Volumes for _(relative paths are for glpi www root, `/var/www/html`)_
+
+    - `config/`
+
+    - `data/`
+
+    - `files/`
+
+    - `plugins/`
+
+    - `marketplace/`
+
+    - `/var/log/`
+
+- Inventory endpoints only available with use of feature flag
+
+- Container health check reports for all services (apache, cron, supervisord)
+
+- GLPI cron script scheduled within container cron. _See notes below._
+
+- GLPI WWW root setup under `public/`
+
+
+## Cron
+
+Cron is installed as part of the image and runs automagically on container start. GLPI cron script is also scheduled to run every minute. However for GLPI to use the CLI cron, you must configure it.
+
+Once GLPI has been setup and configured: 
+
+1. navigate to `Setup -> Automatic Actions`
+
+1. select all items in the list
+
+1. click the `Actions` button
+
+1. select `Update`
+
+1. select `Run Mode`
+
+1. select `CLI`
+
+1. click `Submit`
+
+Now GLPI will use the CLI cron script to run automagic actions.
+
+
+## Inventory
+
+It is posssible to use the inventory features available within GLPI, however by default access to the endpoints is disabled and behind a feature flag.The image by default will return HTTP/404 for the following paths:
+
+- `plugins/fusioninventory/` fusioninventory
+
+- `front/inventory.php` Native (non-GlpiInventory plugin)
+
+- `marketplace/glpiinventory/` GlpiInventory plugin (Marketplace installed)
+
+- `plugins/glpiinventory/` GlpiInventory plugin (plugin folder installed)
+
+To enable an inventory endpoint, using the values above, set environmental variable `GLPI_INVENTORY_PATH` when launching the container. i.e. to use GLPI native inventory `GLPI_INVENTORY_PATH=front/inventory.php`. on launching the container with this variable set, that endpoint is available for use for the inventory feature of GLPI.
+
+!!! tip
+    when using either `marketplace/glpiinventory/` or `plugins/glpiinventory/` as the inventory path you are required to prepend `index.php` to the end of the `server` directive in `agent.cfg`. i.e. `server = https://my-glpi-server/plugins/glpiinventory/index.php`
+
+!!! warning
+    It is strongly advised that when using the inventory features of GLPI, that the endpoints be configured for client authentication.
+
+
+### Client Authentication
+
+Due to the limitations of the inventory agents, mTLS is not available so HTTP Basic Authentication is configurable. by default, when you set the environmental variable `GLPI_INVENTORY_PATH` HTTP basic auth is enabled by default. To configure the users follow these steps:
+
+1. run command from within the container `htpasswd -c /apache-passwd-glpi-inventory {Username to create}`
+
+1. enter the password and confirm when prompted
+
+1. configure the `user` and `password` entries in the `agent.cfg` file.
+
+!!! tip
+    Ensure you limit the permissions on the `agent.cfg` file as it contains a password in clear text. Only the user the agent is run as requires access and you are encouraged to limit to that user only.
+
+!!! warning
+    HTTP Basic authentication is inherently insecure. to overcome this shortfall, ONLY use HTTP Basic Auth over a secure connection _(https)_. 
+
+
+## Running the container
+
+To quickly setup a container the following `docker-compose.yaml` file could be used.
+
+``` yaml title="docker-compose.yaml" linenums="1"
+version: "3.2"
+
+services:
+
+
+  mariadb:
+    image: mariadb:latest
+    container_name: mariadb
+    hostname: mariadb
+    volumes:
+      - /opt/mysql/mysql:/var/lib/mysql
+    environment:
+      - MARIADB_ROOT_PASSWORD=********
+      - MARIADB_DATABASE=glpi
+      - MARIADB_USER=********
+      - MARIADB_PASSWORD=********
+    restart: always
+
+
+  ingress:
+    image: nginx:latest-alpine
+    container_name : ingress
+    hostname: ingress
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+      - /opt/ingress/conf.d:/etc/nginx/conf.d:ro
+      - /opt/ingress/http:/http:ro
+      - /opt/ingress/ssl:/ssl:ro
+    environment:
+      - TIMEZONE=UTC
+    restart: always
+    networks:
+      - ingress
+      - default
+
+
+  glpi:
+    image: nofusscomputing/docker-glpi:dev
+    container_name : glpi
+    hostname: glpi
+    ports:
+      - "80:80"
+    volumes:
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+      - /opt/glpi/plugins:/var/www/html/plugins
+      - /opt/glpi/files:/var/www/html/files
+      - /opt/glpi/config:/var/www/html/config
+      - /opt/glpi/marketplace:/var/www/html/marketplace
+    environment:
+      - TIMEZONE=UTC
+      - GLPI_INVENTORY_PATH=/plugins/glpiinventory/
+    restart: always
+    networks:
+      - default
+
+
+volumes:
+  data_mysql:
+
+
+networks:
+  default:
+    external: no
+  ingress:
+    external: yes
+
+```

docs/task-doc-template.md

@@ -0,0 +1,87 @@
+
+
+short summary of the task file
+
+## {Task Name}
+
+- **Name**: 
+
+- **Description**: 
+
+- **Module**: 
+
+- **Arguments**:
+
+  - 
+
+- **Conditional**: 
+
+- **Tags**: 
+
+  - 
+
+## {Task Name}
+
+- **Name**: 
+
+- **Description**: 
+
+- **Module**: 
+
+- **Arguments**:
+
+  - 
+
+- **Registers**: 
+
+- **Conditional**: 
+
+- **Tags**: 
+
+  - 
+
+
+## Variables
+
+The following variables can be customized in this task file:
+
+```yaml
+variable_name: "default_value"
+```
+
+- `variable_name`: Description of the variable.
+
+## Tags
+
+The tasks in this task file are tagged with the following tags:
+
+- 
+
+## Usage
+
+To use this Ansible task file, you can include it in your playbook or role and provide values for the required variables. Here's an example of how you can use this task file:
+
+1. Create a playbook (e.g., `your_playbook.yaml`) and define the necessary variables:
+
+```yaml
+---
+
+- hosts: your_hosts
+  vars:
+    variable_name: "value"
+  
+  tasks:
+    - include_tasks: path/to/task_file.yaml
+```
+
+2. Create a separate file for the task file (e.g., `task_file.yaml`) and copy the content of the task file into it.
+
+3. Run the playbook:
+
+```shell
+ansible-playbook your_playbook.yaml
+```
+
+Make sure to replace the placeholder values (`variable_name`, `value`) with the appropriate values for your setup.
+
+Note: You may need to adjust the playbook structure and additional tasks based on your specific requirements and the tasks you want to execute.

includes/etc/apache2/sites-available/000-default.conf

@@ -1,15 +1,62 @@
 <VirtualHost *:80>
   DocumentRoot /var/www/html/public
 
+  <Location "/plugins/glpiinventory/index.php">
+
+    <If "%{ENV:GLPI_INVENTORY_PATH} != ''">
+
+      <If "%{ENV:GLPI_INVENTORY_AUTH} == ''">
+
+        AuthType Basic
+        AuthName "Restricted Access"
+        AuthUserFile /apache-passwd-glpi-inventory
+        Require valid-user
+
+      </If>
+
+    </If>
+
+  </Location>
+
+
   <Directory /var/www/html/public>
+
     Require all granted
     RewriteEngine On
+
+    # Paths:
+    #  Reference: https://glpi-agent.readthedocs.io/en/latest/configuration.html
+    #  - fusioninventory:                                  /plugins/fusioninventory/
+    #  - Native (non-GlpiInventory plugin):                /front/inventory.php
+    #  - GlpiInventory plugin (Marketplace installed):     /marketplace/glpiinventory/
+    #  - GlpiInventory plugin (plugin folder installed):   /plugins/glpiinventory/
+    #    NOTE: for glpi inventory index.php must be prepended to path so that GUI can still be accessed.
+
+    # Don't provide access to inventory on these paths
+    # ToDo: add inventory path for /plugins/fusioninventory/
+
+    RewriteCond %{ENV:GLPI_INVENTORY_PATH} !/front/inventory.php
+      RewriteCond %{REQUEST_URI} ^/front/inventory.php$
+    RewriteRule ^(.*)$ - [R=404,NC]
+
+    RewriteCond %{ENV:GLPI_INVENTORY_PATH} !/plugins/glpiinventory/
+      RewriteCond %{REQUEST_URI} /plugins/glpiinventory
+      RewriteCond %{REQUEST_URI} !/plugins/glpiinventory/front/
+    RewriteRule ^(.*)$ - [R=404,NC]
+
+    RewriteCond %{ENV:GLPI_INVENTORY_PATH} !/marketplace/glpiinventory/
+      RewriteCond %{REQUEST_URI} /marketplace/glpiinventory
+      RewriteCond %{REQUEST_URI} !/marketplace/glpiinventory/front/
+    RewriteRule ^(.*)$ - [R=404,NC]
+
+
     RewriteCond %{REQUEST_FILENAME} !-f
-  
     RewriteRule ^(.*)$ index.php [QSA,L]
+
   </Directory>
 
   ErrorLog /var/log/apache2/error-glpi.log
   LogLevel warn
   CustomLog /var/log/apache2/access-glpi.log combined
+
 </VirtualHost>

includes/var/www/html/css/palettes/nfc.scss

@@ -0,0 +1,102 @@
+
+$primary: #73bcf7;
+$primary-fg: #f0f0f0;
+
+$secondary: #7e7e7e;
+$secondary-fg: #73ff00;
+
+$dark: #212427;
+$light: #f0f0f0;
+
+$link-color: #0066cc;
+$mainmenu_bg: #212427;
+$mainmenu_fg: #f0f0f0;
+$accent-color: #73bcf7;
+$text-muted: #666666;
+
+
+@import "../includes/palette_light";
+
+
+/*
+* ---------------------------------------------------------------------
+* CSS
+* ---------------------------------------------------------------------
+*/
+.navbar-vertical.navbar-expand-lg {
+    width: 275px
+}
+
+.navbar-expand-lg.navbar-vertical ~ .navbar, .navbar-expand-lg.navbar-vertical ~ .page-wrapper {
+    margin-left: 275px;
+}
+
+.navbar-light {
+    //box-shadow: inset 0 -1px 0 0 rgba(98, 105, 118, 0.16);
+    background-color: #151515;
+}
+
+
+.navbar {
+    min-height: 76px;
+}
+
+
+span.input-group-text {
+    visibility: hidden;
+    border-radius: 4px;
+}
+
+
+
+// Header Entity button
+.navbar .text-muted {
+    color: $accent-color !important;
+    opacity: 70%;
+  }
+
+
+body {
+    --tblr-body-bg: #f0f0f0;
+}
+
+@include media-breakpoint-up(lg) {
+    body.navbar-collapsed {
+        .sidebar {
+            #navbar-menu {
+                .nav-item {
+                    .nav-link {
+                        & + .dropdown-menu {
+                            
+                            color: $accent-color;
+                            border: 1px solid $accent-color;
+
+                            .dropdown-item {
+                                &.hover {
+                                    border-left-color: $accent-color;
+                                }
+
+                                &.active {
+                                    background-color: lighten($mainmenu-bg, 40%);
+                                    border-left-color: $accent-color;
+                                }
+                            }
+                        }
+                    }
+                    
+                }
+            }
+        }
+    }
+}
+
+.dashboard {
+
+    .card {
+        box-shadow: none !important;
+
+        margin: 0 !important;
+        border-radius: 5px !important;
+    }
+
+}

mkdocs.yml

@@ -0,0 +1,30 @@
+INHERIT: website-template/mkdocs.yml
+
+docs_dir: 'docs'
+
+repo_name: Docker GLPI
+repo_url: https://gitlab.com/nofusscomputing/projects/docker-glpi
+edit_uri: '/-/ide/project/nofusscomputing/projects/docker-glpi/edit/development/-/docs/'
+
+nav:
+- Home: index.md
+
+- Articles: 
+
+  - articles/index.md
+
+- Projects: 
+
+  - projects/index.md
+
+  - GLPI Docker:
+
+    - projects/glpi/index.md
+
+
+- Operations: 
+
+  - operations/index.md
+
+- Contact Us: contact.md
+