Added support for nfs, removed node versions because node is not needed, added shell code for storage options: digitalocean, gcp, aws, openstack, and ceph

group_vars/all

@@ -1,12 +1,37 @@
 ---
 # Variables listed here are applicable to all host groups
 
+# Software versions
 docker_compose_version_to_install: 1.18.0
 docker_ce_version_to_install: 17.09.1~ce-0~ubuntu
-nvm_version: v0.33.5
+
-node_version: 8.4.0
+# User stuff
 default_pub_key: https://raw.githubusercontent.com/jcwimer/ubuntu-template/master/post/id_rsa.pub
 standard_user: cody
 git_user: "Jacob Cody Wimer"
 git_email: "jacob.wimer@gmail.com"
-chosen_timezone: "America/New_York"
+chosen_timezone: "America/New_York"
+
+# Persistent storage if you are doing a single machine deploy, local is an option. If you are doing multi instance deploy, choose one of the following:
+# nfs
+# digitalocean
+# gcp
+# aws
+# openstack
+# ceph
+# then fill out the variables associated with your choice below
+storage_type: "local"
+
+# nfs variables: these need defined if using nfs storage
+#nfs_address: 0.0.0.0
+#nfs_root_path: /some/filepath/on/nfs
+
+# digitalocean variables: these need defined if using digitalocean storage
+
+# gcp variables: these need defined if using gcp storage
+
+# aws variables: these need defined if using aws storage
+
+# openstack variables: these need defined if using openstack storage
+
+# ceph variables: these need defined if using ceph storage

roles/dokuwiki/templates/docker-compose.yml.j2

@@ -1,31 +1,22 @@
-version: '2'
+version: '2'
-services:
+services:
-  web:
+  dokuwiki:
-    image: gitea/gitea:1.3.2
+    image: 'bitnami/dokuwiki:latest'
-    volumes:
+    labels:
-      - ./data:/data
+      kompose.service.type: nodeport
-    ports:
+    ports:
-      - "80:3000"
+      - '80:80'
-      - "2222:22"
+      - '443:443'
-    restart: always
+    volumes:
-# setup options: https://docs.gitea.io/en-us/config-cheat-sheet/
+      - 'dokuwiki_data:/bitnami'
-#    networks:
+volumes:
-#      - db
+  dokuwiki_data:
-#    depends_on:
+  {% if storage_type == 'nfs' %}
-#      - db
+    driver: local
-#  db:
+    driver_opts:
-#    image: mariadb:10
+      type: nfs
-#    restart: always
+      o: "addr={{ nfs_address }},soft,nolock,rw"
-#    networks:
+      device: ":{{ nfs_root_path }}/dokuwiki"
-#      - db
+  {% elif storage_type == 'local' %}
-#    environment:
+    driver: local
-#      - MYSQL_ROOT_PASSWORD=changeme
+  {% endif %}
-#      - MYSQL_DATABASE=gitea
-#      - MYSQL_USER=gitea
-#      - MYSQL_PASSWORD=changeme
-#    volumes:
-#      - db/:/var/lib/mysql
-#networks:
-#  db:
-#volumes:
-#  db:

roles/gitea/templates/docker-compose.yml.j2

@@ -1,14 +1,45 @@
-version: '2'
+version: '2'
-services:
+services:
-  dokuwiki:
+  web:
-    image: 'bitnami/dokuwiki:latest'
+    image: gitea/gitea:1.3.2
-    labels:
+    volumes:
-      kompose.service.type: nodeport
+      - gitea_data:/data
-    ports:
+    ports:
-      - '80:80'
+      - "80:3000"
-      - '443:443'
+      - "2222:22"
-    volumes:
+    restart: always
-      - 'dokuwiki_data:/bitnami'
+
-volumes:
+volumes:
-  dokuwiki_data:
+  gitea_data:
-    driver: local
+  {% if storage_type == 'nfs' %}
+    driver: local
+    driver_opts:
+      type: nfs
+      o: "addr={{ nfs_address }},soft,nolock,rw"
+      device: ":{{ nfs_root_path }}/gitea"
+  {% elif storage_type == 'local' %}
+    driver: local
+  {% endif %}
+
+
+# setup options: https://docs.gitea.io/en-us/config-cheat-sheet/
+#    networks:
+#      - db
+#    depends_on:
+#      - db
+#  db:
+#    image: mariadb:10
+#    restart: always
+#    networks:
+#      - db
+#    environment:
+#      - MYSQL_ROOT_PASSWORD=changeme
+#      - MYSQL_DATABASE=gitea
+#      - MYSQL_USER=gitea
+#      - MYSQL_PASSWORD=changeme
+#    volumes:
+#      - db/:/var/lib/mysql
+#networks:
+#  db:
+#volumes:
+#  db: