diff --git a/.gitignore b/.gitignore index ea1d969..5d0f9ff 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,9 @@ public/imgs/big_favicons/*.webp public/imgs/favicons/*.webp public/imgs/screenshots/*.webp public/imgs/thumbs/*.webp + +!public/imgs/screenshots/screen_full_dark-light.webp +!public/imgs/screenshots/screen_compact_dark-light.webp +!public/imgs/screenshots/screen_icon_dark-light.webp vendor/ composer.lock \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 345cc3c..49f1284 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ FROM debian:stable-slim MAINTAINER Knah Tsaeb -LABEL version="0.1.1" +LABEL version="0.2.0" LABEL description="Apache 2 / PHP / Nofu" ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get -y update && apt-get install -y git composer php apache2 php-cli php-curl php-gd && apt-get clean && apt-get autoclean && apt-get autoremove +RUN apt-get -y update && apt-get install -y git composer php apache2 php-cli php-curl php-gd && apt-get clean && apt-get autoremove -y RUN rm -r /var/www/ && mkdir /var/www/ @@ -17,12 +17,10 @@ RUN git clone https://forge.leslibres.org/Knah-Tsaeb/Nofu.git --branch main --si RUN composer install --no-dev && chown -R www-data:www-data /var/www/ -COPY .docker/start.sh /usr/bin/start.sh +RUN cp .docker/start.sh /usr/bin/start.sh RUN chmod +x /usr/bin/start.sh -WORKDIR / - -COPY .docker/apache2/nofu.conf /etc/apache2/sites-available/nofu.conf +RUN cp .docker/apache2/nofu.conf /etc/apache2/sites-available/nofu.conf RUN a2dissite 000-default.conf && a2ensite nofu.conf && a2enmod rewrite EXPOSE 80 @@ -32,7 +30,7 @@ WORKDIR /var/www/ ENTRYPOINT "start.sh" # Build image -# docker buildx build -t nofu:0.1.0 . +# docker buildx build -t nofu:0.2.0 . # Run container -# docker run -d --restart unless-stopped -v nofu_data:/var/www/data -e TZ=UTC -p 8189:80 --name nofu nofu:0.1.0 -# docker run -d --restart unless-stopped -v /opt/nofu:/var/www/data -e TZ=UTC -p 8189:80 --name nofu nofu:0.1.0 \ No newline at end of file +# docker run -d --restart unless-stopped -v nofu_data:/var/www/data -e TZ=UTC -p 8189:80 --name nofu nofu:0.2.0 +# docker run -d --restart unless-stopped -v /opt/nofu:/var/www/data -e TZ=UTC -p 8189:80 --name nofu nofu:0.2.0 \ No newline at end of file diff --git a/README.md b/README.md index 9dc1bde..91bebbb 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,9 @@ There are many impressive dashboards ([awesome-selfhosted](https://awesome-selfh I also wanted a place where my family could find all my services with a quick documentation on my infrastructure (software used, what it's for, where it's located, where backups are stored...), in case I stop functioning one day. So that they can recover the family data or call someone to help them. -![screenshot]() +![screenshot](public/imgs/screenshots/screen_full_dark-light.webp) +![screenshot](public/imgs/screenshots/screen_compact_dark-light.webp) +![screenshot](public/imgs/screenshots/screen_icon_dark-light.webp) ## Features @@ -57,31 +59,35 @@ Clone, build and run. #### Clone ```shell -git clone https://forge.leslibres.org/Knah-Tsaeb/Nofu.git -cd nofu +cd /tmp +wget https://forge.leslibres.org/Knah-Tsaeb/Nofu/raw/branch/main/Dockerfile ``` #### Build ```shell -docker buildx build -t nofu:0.1.0 . +docker buildx build -t nofu:0.2.0 . ``` #### Run ```shell -docker run -d --restart unless-stopped -v nofu_data:/var/www/data -e TZ=UTC -p 8189:80 --name nofu nofu:0.1.0 +docker run -d --restart unless-stopped -v nofu_data:/var/www/data -e TZ=UTC -p 8189:80 --name nofu nofu:0.2.0 ``` ## Ressources - * docker icon SVGICON - * docker icon SVGICON - * docker icon SVGICON - * docker icon SVGICON - * docker icon SVGICON - * docker icon SVGICON - * docker icon SVGICON + * docker icon svgrepo.com (MLP licence) + * docker icon svgrepo.com (CC Attribution License) + * logout icon svgrepo.com (CCO licence) + * logout icon svgrepo.com (CCO licence) + * docker icon Missing origin, need to find origin or change + * redirection icon svgrepo.com (CCO licence) + * docker icon svgrepo.com (CCO licence) + * docker icon svgrepo.com (CCO licence) + * docker icon svgrepo.com (Logo License) + * docker icon svgrepo.com Logo (CC Attribution License) + * docker icon svgrepo.com Logo (CC0 License) And some code from Stack Overflow :-) diff --git a/public/assets/icons/docker.svg b/public/assets/icons/docker.svg index a5f8bea..36ec82f 100644 --- a/public/assets/icons/docker.svg +++ b/public/assets/icons/docker.svg @@ -1 +1,9 @@ - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/public/assets/icons/help.svg b/public/assets/icons/help.svg new file mode 100644 index 0000000..3feccd0 --- /dev/null +++ b/public/assets/icons/help.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/public/assets/icons/logout.svg b/public/assets/icons/logout.svg index fa1572d..cec9c42 100644 --- a/public/assets/icons/logout.svg +++ b/public/assets/icons/logout.svg @@ -1 +1,17 @@ - \ No newline at end of file + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/icons/moon.svg b/public/assets/icons/moon.svg new file mode 100644 index 0000000..393318c --- /dev/null +++ b/public/assets/icons/moon.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/public/assets/icons/redirection.svg b/public/assets/icons/redirection.svg index 32c0bb5..3378fbd 100644 --- a/public/assets/icons/redirection.svg +++ b/public/assets/icons/redirection.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/icons/server.svg b/public/assets/icons/server.svg index c6665a8..84cc341 100644 --- a/public/assets/icons/server.svg +++ b/public/assets/icons/server.svg @@ -1 +1,21 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/icons/settings.svg b/public/assets/icons/settings.svg new file mode 100644 index 0000000..113864d --- /dev/null +++ b/public/assets/icons/settings.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/icons/vm.svg b/public/assets/icons/vm.svg index fd04997..8a44925 100644 --- a/public/assets/icons/vm.svg +++ b/public/assets/icons/vm.svg @@ -1 +1,10 @@ - \ No newline at end of file + + + + + QEMU icon + + + + \ No newline at end of file diff --git a/public/assets/icons/web.svg b/public/assets/icons/web.svg index f00decb..4420548 100644 --- a/public/assets/icons/web.svg +++ b/public/assets/icons/web.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/public/assets/icons/webapp.svg b/public/assets/icons/webapp.svg index 94f7b24..41599e6 100644 --- a/public/assets/icons/webapp.svg +++ b/public/assets/icons/webapp.svg @@ -1 +1,34 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/imgs/screenshots/screen_compact_dark-light.webp b/public/imgs/screenshots/screen_compact_dark-light.webp new file mode 100644 index 0000000..cc0bb41 Binary files /dev/null and b/public/imgs/screenshots/screen_compact_dark-light.webp differ diff --git a/public/imgs/screenshots/screen_full_dark-light.webp b/public/imgs/screenshots/screen_full_dark-light.webp new file mode 100644 index 0000000..8e03a71 Binary files /dev/null and b/public/imgs/screenshots/screen_full_dark-light.webp differ diff --git a/public/imgs/screenshots/screen_icon_dark-light.webp b/public/imgs/screenshots/screen_icon_dark-light.webp new file mode 100644 index 0000000..e805f53 Binary files /dev/null and b/public/imgs/screenshots/screen_icon_dark-light.webp differ diff --git a/public/index.php b/public/index.php index 85482f3..8963aab 100644 --- a/public/index.php +++ b/public/index.php @@ -64,6 +64,16 @@ if ($KTH->cacheExist()) { 'location' => 'web', 'desc' => 'Wikipedia, the free encyclopedia', 'type' => 'webapp' + ], + [ + 'title' => 'Awesome-Selfhosted', + 'screenshot' => 'Awesome-Selfhosted.png', + 'favicon' => 'Awesome-Selfhosted.ico', + 'link' => 'https://awesome-selfhosted.net/', + 'appHome' => 'https://www.mediawiki.org/wiki/MediaWiki', + 'location' => 'web', + 'desc' => 'A list of Free Software network services and web applications which can be hosted on your own servers', + 'type' => 'webapp' ]]; } $generator = new HTMLGenerator($services);