diff options
author | Christian Pointner <equinox@spreadspace.org> | 2020-03-25 20:55:53 +0100 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2020-03-25 20:55:53 +0100 |
commit | e328d1bb0fe0f08b2f993a5a933307b77ad95c29 (patch) | |
tree | c612f8062fade03d2cc30649c62ea765df57541e /roles/nextcloud/templates | |
parent | sk-cloudia: new nextcloud instnace next.skillz.biz (diff) |
move some roles to app/
Diffstat (limited to 'roles/nextcloud/templates')
-rw-r--r-- | roles/nextcloud/templates/apache-site.conf.j2 | 10 | ||||
-rw-r--r-- | roles/nextcloud/templates/cron-.timer.j2 | 9 | ||||
-rw-r--r-- | roles/nextcloud/templates/cron@.service.j2 | 15 | ||||
-rwxr-xr-x | roles/nextcloud/templates/nextcloud-occ.j2 | 22 | ||||
-rwxr-xr-x | roles/nextcloud/templates/nextcloud-upgrade.j2 | 42 | ||||
-rw-r--r-- | roles/nextcloud/templates/pod-with-mariadb.yml.j2 | 81 | ||||
-rw-r--r-- | roles/nextcloud/templates/run-cron.sh.j2 | 11 |
7 files changed, 0 insertions, 190 deletions
diff --git a/roles/nextcloud/templates/apache-site.conf.j2 b/roles/nextcloud/templates/apache-site.conf.j2 deleted file mode 100644 index a52a7fc5..00000000 --- a/roles/nextcloud/templates/apache-site.conf.j2 +++ /dev/null @@ -1,10 +0,0 @@ -<VirtualHost *:8080> - ServerAdmin webmaster@localhost - DocumentRoot /var/www/html - - UseCanonicalName Off - UseCanonicalPhysicalPort Off - - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined -</VirtualHost> diff --git a/roles/nextcloud/templates/cron-.timer.j2 b/roles/nextcloud/templates/cron-.timer.j2 deleted file mode 100644 index 0c3f7cd7..00000000 --- a/roles/nextcloud/templates/cron-.timer.j2 +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Nextcloud cron.php job timer for %i - -[Timer] -OnCalendar=*:{{ 5 | random(seed=item) }}/5 -Unit=nextcloud-cron@{{ item }}.service - -[Install] -WantedBy=timers.target diff --git a/roles/nextcloud/templates/cron@.service.j2 b/roles/nextcloud/templates/cron@.service.j2 deleted file mode 100644 index 822f64b4..00000000 --- a/roles/nextcloud/templates/cron@.service.j2 +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Nextcloud cron.php job for %i - -[Service] -Type=oneshot -ExecStart={{ nextcloud_base_path }}/%i/config/run-cron.sh -NoNewPrivileges=yes -PrivateTmp=yes -PrivateDevices=yes -ProtectSystem=strict -ProtectHome=yes -ProtectKernelTunables=yes -ProtectControlGroups=yes -RestrictRealtime=yes -RestrictAddressFamilies=AF_UNIX AF_INET diff --git a/roles/nextcloud/templates/nextcloud-occ.j2 b/roles/nextcloud/templates/nextcloud-occ.j2 deleted file mode 100755 index a79c5335..00000000 --- a/roles/nextcloud/templates/nextcloud-occ.j2 +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -INST_NAME="$1" -shift - -if [ -z "$INST_NAME" ]; then - echo "Usage: $0 <instance> [ <arguments for occ.php> ... ]" - exit 1 -fi - -set -eu -{% if kubernetes_cri_socket is defined %} -export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}" -{% endif %} - -pod_id=$(crictl pods -q --state ready --name "$INST_NAME-{{ ansible_nodename }}") -if [ -z "$pod_id" ]; then echo "Pod not found"; exit 1; fi - -container_id=$(crictl ps -q --name '^nextcloud$' -p "$pod_id") -if [ -z "$container_id" ]; then echo "Container not found"; exit 1; fi - -exec crictl exec -it "$container_id" php /var/www/html/occ $@ diff --git a/roles/nextcloud/templates/nextcloud-upgrade.j2 b/roles/nextcloud/templates/nextcloud-upgrade.j2 deleted file mode 100755 index aac5001f..00000000 --- a/roles/nextcloud/templates/nextcloud-upgrade.j2 +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -INST_NAME="$1" -VERSION="$2" -if [ -z "$INST_NAME" ] || [ -z "$VERSION" ]; then - echo "Usage: $0 <instance> <version>" - exit 1 -fi - -set -eu - -K8S_MANIFEST_D="/etc/kubernetes/manifests/" -K8S_MANIFEST_FILE="$K8S_MANIFEST_D/nextcloud-$INST_NAME.yml" -if [ ! -e "$K8S_MANIFEST_FILE" ]; then - echo "could not find manifest file: $K8S_MANIFEST_FILE" - exit 2 -fi - -TMP_D=$(mktemp -d -t nextcloud-upgrade.XXXXXXX) -function cleanup { - rm -rf "$TMP_D" -} -trap cleanup EXIT - -echo "*** Pre-Pulling the image" -echo "" -ctr -n k8s.io image pull "docker.io/library/nextcloud:$VERSION" -echo "" - -echo "*** Patching manifest file" -echo "" -sed "s#image: \"nextcloud:.*\"#image: \"nextcloud:$VERSION\"#" "$K8S_MANIFEST_FILE" > "$TMP_D/upgraded.yml" -set +e -diff -u "$K8S_MANIFEST_FILE" "$TMP_D/upgraded.yml" -if [ $? -eq 0 ]; then - echo "patching file failed?" - exit 2 -fi -cat "$TMP_D/upgraded.yml" > "$K8S_MANIFEST_FILE" -echo "" - -exit 0 diff --git a/roles/nextcloud/templates/pod-with-mariadb.yml.j2 b/roles/nextcloud/templates/pod-with-mariadb.yml.j2 deleted file mode 100644 index dfef3810..00000000 --- a/roles/nextcloud/templates/pod-with-mariadb.yml.j2 +++ /dev/null @@ -1,81 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "nextcloud-{{ item.key }}" -spec: - securityContext: - allowPrivilegeEscalation: false - containers: - - name: nextcloud - image: "nextcloud:{{ item.value.version }}" - securityContext: - runAsUser: {{ nextcloud_app_uid }} - runAsGroup: {{ nextcloud_app_gid }} - resources: - limits: - memory: "4Gi" -{% if 'new' in item.value and item.value.new %} - env: - - name: NEXTCLOUD_TRUSTED_DOMAINS - value: "{{ item.value.hostnames | join(' ') }}" - - name: MYSQL_HOST - value: 127.0.0.1 - - name: MYSQL_DATABASE - value: nextcloud - - name: MYSQL_USER - value: nextcloud - - name: MYSQL_PASSWORD - value: "{{ item.value.database.password }}" -{% endif %} - volumeMounts: - - name: nextcloud - mountPath: /var/www/html - - name: config - mountPath: /etc/apache2/sites-available/000-default.conf - subPath: apache-site.conf - readOnly: true - - name: config - mountPath: /etc/apache2/ports.conf - subPath: ports.conf - readOnly: true - ports: - - containerPort: 8080 - hostPort: {{ item.value.port }} - - name: database - image: "mariadb:{{ item.value.database.version }}" - args: - - --transaction-isolation=READ-COMMITTED - - --binlog-format=ROW - securityContext: - runAsUser: {{ nextcloud_db_uid }} - runAsGroup: {{ nextcloud_db_gid }} - resources: - limits: - memory: "2Gi" -{% if 'new' in item.value and item.value.new %} - env: - - name: MYSQL_RANDOM_ROOT_PASSWORD - value: "true" - - name: MYSQL_DATABASE - value: nextcloud - - name: MYSQL_USER - value: nextcloud - - name: MYSQL_PASSWORD - value: "{{ item.value.database.password }}" -{% endif %} - volumeMounts: - - name: database - mountPath: /var/lib/mysql - volumes: - - name: config - hostPath: - path: "{{ nextcloud_base_path }}/{{ item.key }}/config/" - type: Directory - - name: nextcloud - hostPath: - path: "{{ nextcloud_base_path }}/{{ item.key }}/nextcloud" - type: Directory - - name: database - hostPath: - path: "{{ nextcloud_base_path }}/{{ item.key }}/{{ item.value.database.type }}" - type: Directory diff --git a/roles/nextcloud/templates/run-cron.sh.j2 b/roles/nextcloud/templates/run-cron.sh.j2 deleted file mode 100644 index 9936bad1..00000000 --- a/roles/nextcloud/templates/run-cron.sh.j2 +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -{% if kubernetes_cri_socket is defined %} -export CONTAINER_RUNTIME_ENDPOINT="{{ kubernetes_cri_socket }}" -{% endif %} - -POD_NAME="{{ item }}-$(hostname)" -POD_ID=$(crictl pods --name "$POD_NAME" --state ready -q) -CONTAINER_ID=$(crictl ps --pod "$POD_ID" --name nextcloud -q) - -exec crictl exec "$CONTAINER_ID" php -f /var/www/html/cron.php |