From e2a562f04f1eaa29f8f457a4ab1c322124a68fd2 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Thu, 3 Mar 2022 11:42:39 +0100
Subject: [PATCH] Remove Lola's blog files

---
 all.yml                                    |  4 -
 roles/grav/files/entrypoint.sh             |  7 --
 roles/grav/tasks/main.yml                  | 41 ----------
 roles/grav/templates/Dockerfile.j2         | 92 ----------------------
 roles/grav/templates/docker-compose.yml.j2 | 27 -------
 roles/grav/vars/main.yml                   |  3 -
 6 files changed, 174 deletions(-)
 delete mode 100644 roles/grav/files/entrypoint.sh
 delete mode 100644 roles/grav/tasks/main.yml
 delete mode 100644 roles/grav/templates/Dockerfile.j2
 delete mode 100644 roles/grav/templates/docker-compose.yml.j2
 delete mode 100644 roles/grav/vars/main.yml

diff --git a/all.yml b/all.yml
index 23dfc8d..598184f 100644
--- a/all.yml
+++ b/all.yml
@@ -18,10 +18,6 @@
       tags:
         - docker
         - traefik
-    - role: grav
-      tags:
-        - docker
-        - grav
     - role: lychee
       tags:
         - docker
diff --git a/roles/grav/files/entrypoint.sh b/roles/grav/files/entrypoint.sh
deleted file mode 100644
index 5b01202..0000000
--- a/roles/grav/files/entrypoint.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-echo "Launching supercronic..."
-supercronic /var/www/crontab &
-echo "Launching Grav..."
-exec $@
diff --git a/roles/grav/tasks/main.yml b/roles/grav/tasks/main.yml
deleted file mode 100644
index 445cfd4..0000000
--- a/roles/grav/tasks/main.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- name: Create Grav directory
-  file:
-    path: "{{ grav_folder_name }}"
-    state: directory
-    owner: "{{ base_user_name }}"
-    group: "{{ base_user_name }}"
-    mode: 0755
-
-- name: Copy Grav templates
-  template:
-    src: "{{ item }}"
-    # Remove .j2 extension
-    dest: "{{ grav_folder_name }}/{{ (item | splitext)[0] }}"
-    owner: "{{ base_user_name }}"
-    group: "{{ base_user_name }}"
-    mode: 0644
-  loop:
-    - docker-compose.yml.j2
-    - Dockerfile.j2
-
-- name: Copy Grav entrypoint
-  copy:
-    src: entrypoint.sh
-    dest: "{{ grav_folder_name }}/entrypoint.sh"
-    owner: "{{ base_user_name }}"
-    group: "{{ base_user_name }}"
-    mode: 0644
-
-- name: Build Grav
-  community.docker.docker_compose:
-    project_src: "{{ grav_folder_name }}"
-    build: yes
-    
-- name: Ensure container is up to date
-  community.docker.docker_compose:
-    project_src: "{{ traefik_folder_name }}"
-    remove_orphans: yes
-    pull: yes
-    recreate: smart
-    state: present
diff --git a/roles/grav/templates/Dockerfile.j2 b/roles/grav/templates/Dockerfile.j2
deleted file mode 100644
index d041214..0000000
--- a/roles/grav/templates/Dockerfile.j2
+++ /dev/null
@@ -1,92 +0,0 @@
-FROM php:7.4-apache
-LABEL maintainer="Andy Miller <rhuk@getgrav.org> (@rhukster)"
-
-# Enable Apache Rewrite + Expires Module
-RUN a2enmod rewrite expires && \
-    sed -i 's/ServerTokens OS/ServerTokens ProductOnly/g' \
-    /etc/apache2/conf-available/security.conf
-
-# Install dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    unzip \
-    libfreetype6-dev \
-    libjpeg62-turbo-dev \
-    libpng-dev \
-    libyaml-dev \
-    libzip4 \
-    libzip-dev \
-    zlib1g-dev \
-    libicu-dev \
-    g++ \
-    git \
-    cron \
-    vim \
-    && docker-php-ext-install opcache \
-    && docker-php-ext-configure intl \
-    && docker-php-ext-install intl \
-    && docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ \
-    && docker-php-ext-install -j$(nproc) gd \
-    && docker-php-ext-install zip \
-    && rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
-    echo 'opcache.memory_consumption=128'; \
-    echo 'opcache.interned_strings_buffer=8'; \
-    echo 'opcache.max_accelerated_files=4000'; \
-    echo 'opcache.revalidate_freq=2'; \
-    echo 'opcache.fast_shutdown=1'; \
-    echo 'opcache.enable_cli=1'; \
-    echo 'upload_max_filesize=128M'; \
-    echo 'post_max_size=128M'; \
-    echo 'expose_php=off'; \
-    } > /usr/local/etc/php/conf.d/php-recommended.ini
-
-RUN pecl install apcu \
-    && pecl install yaml-2.0.4 \
-    && docker-php-ext-enable apcu yaml
-
-# Install Supercronic
-ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.1.12/supercronic-linux-amd64 \
-    SUPERCRONIC=supercronic-linux-amd64 \
-    SUPERCRONIC_SHA1SUM=048b95b48b708983effb2e5c935a1ef8483d9e3e
-
-RUN curl -fsSLO "$SUPERCRONIC_URL" \
- && echo "${SUPERCRONIC_SHA1SUM}  ${SUPERCRONIC}" | sha1sum -c - \
- && chmod +x "$SUPERCRONIC" \
- && mv "$SUPERCRONIC" "/usr/local/bin/${SUPERCRONIC}" \
- && ln -s "/usr/local/bin/${SUPERCRONIC}" /usr/local/bin/supercronic
-
-# Create cron job for Grav maintenance scripts
-RUN echo "*/30 * * * * cd /var/www/html;/usr/local/bin/php bin/grav scheduler 1>> /dev/null 2>&1" > /var/www/crontab
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-RUN sed -i s/80/{{ grav_internal_port }}/g /etc/apache2/sites-enabled/000-default.conf /etc/apache2/ports.conf
-
-# Set user to www-data
-RUN chown www-data:www-data /var/www
-USER www-data
-
-
-# Set Grav version
-ARG GRAV_VERSION={{ grav_version }}
-
-# Install grav
-WORKDIR /var/www
-RUN curl -o grav-admin.zip -SL https://getgrav.org/download/core/grav-admin/${GRAV_VERSION} && \
-    unzip grav-admin.zip && \
-    mv -T /var/www/grav-admin /var/www/html && \
-    rm grav-admin.zip
-
-# Install plugins
-RUN cd html && \
-    bin/gpm install admin
-
-# provide container inside image for data persistance
-VOLUME ["/var/www/html"]
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["apache2-foreground"]
diff --git a/roles/grav/templates/docker-compose.yml.j2 b/roles/grav/templates/docker-compose.yml.j2
deleted file mode 100644
index 7760d67..0000000
--- a/roles/grav/templates/docker-compose.yml.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-version: "{{ compose_version }}"
-
-networks:
-  proxy:
-    name: "{{ traefik_network }}"
-
-volumes:
-  grav_lola:
-    name: grav_lola
-
-services:
-  grav_lola:
-    image: grav:{{ grav_version }}
-    build: .
-    container_name: grav_lola
-    volumes:
-      - grav_lola:/var/www/html
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    networks:
-      - proxy
-    labels:
-      traefik.http.routers.grav.entrypoints: websecure
-      traefik.http.routers.grav.rule: "Host(`blog.leaula.me`)"
-      traefik.http.services.grav.loadbalancer.server.port: "{{ grav_internal_port }}"
-      traefik.enable: true
-    restart: unless-stopped
diff --git a/roles/grav/vars/main.yml b/roles/grav/vars/main.yml
deleted file mode 100644
index baec59a..0000000
--- a/roles/grav/vars/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-grav_internal_port: 8080
-grav_version: 1.7.13
-grav_folder_name: "{{ docker_files }}/grav"