Add env vars

diff --git a/compose.yml b/compose.yml
index c96f371b09d4d8f4c5a30a394005828a69a4dfd8..41ed79563e0bf78c2f24cb8c4823619bd68d4b90 100644 (file)
--- a/compose.yml
+++ b/compose.yml
@@ -7,7 +7,7 @@ services:
       - /var/log/mail/mail.log:/var/log/mail/mail.log:ro
       - /var/log/auth.log:/var/log/auth.log:ro
     networks:
-      - common
+      - www
     restart: always
 
   updates:
@@ -29,7 +29,7 @@ services:
       - "80:80"
       - "443:443"
     networks:
-      - common
+      - www
     volumes:
       - ./caddy:/etc/caddy/Caddyfile
       - ./web/data/:/data/caddy/
@@ -48,7 +48,7 @@ services:
       - "587:587"
       - "993:993"
     networks:
-      - common
+      - www
     volumes:
       - ./mail/data/:/var/mail/
       - ./mail/state/:/var/mail-state/
@@ -64,10 +64,11 @@ services:
   repos:
     container_name: repos
     image: jgiannuzzi/gitolite
-    ports:
-      - "22:22"
+    env_file: ./git/env
     volumes:
       - ./git/repos/:/var/lib/git/
+    ports:
+      - "22:22"
 
   gitweb:
     container_name: gitweb
@@ -78,6 +79,8 @@ services:
       - ./git/repos/:/var/lib/git/:ro
     expose:
       - "80"
+    networks:
+      - www
 
   csc:
     container_name: csc
@@ -90,7 +93,7 @@ services:
     expose:
       - "80"
     networks:
-      - common
+      - www
 
 networks:
-  common:
+  www:

diff --git a/git/env b/git/env
new file mode 100644 (file)
index 0000000..915a107
--- /dev/null
+++ b/git/env
@@ -0,0 +1,2 @@
+SSH_KEY_NAME="moncheeta"
+SSH_KEY="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCbhuxFr7zO5fcvLMP8dt1SQAQ1uEw0rJCeFI7o5JFULA4w1dB9yc9FotnVwxRroXpBHxmH7jTFsuCXjHj5CQFDnDb0Vq6iVrtj4WEWBg4N+juA347pmKPLVnyEofpjIHHFSj4b4U/ozk/xEfekNrAxrjhMYcREXQsMI168MNupCEqrqWAyDygokKTicwEX0YNCX2ig5Obs9dUj/nbaWL9/kWgOejuAzQd9guncC0r6Oc8yce+FHjqFpd6tApCLF1IN0KNBfj2k24WEU9JuovwwZ+mbFvKTeZF0O9aXlvuVlrKIS6yfn6Srh22GQJMEhcDMypO8t3AnsKli6vM6J7iUWJuksLf9fOty2ZfJghMOlUHYVcAaXPn2ESReNjSJfHtNOsvIlXsXMznFnTK2WL0115aF0th9Ivxn+t/9onOj6iQALgIYiRSM9tg7zKu1+vglZmU1CKsdzXGGP5P/UVeQFkxjUsYEjEebInfbIl6I246HpLLQIwkqGm/21Ge5hLAEiKYtasoFyRqcc1pWhwj96TMw096pWGrZg89CO8P0U9INhWfHbogT4c07reZpZuSH745thufYQ0CtgJQOlCTQdyilHyZL3d6yDoITNycqMIklnNPRDB9Po5tdD6qzDg7p//OurYx3d5FkhMby6H8/B/79E0+ASh3so5TRP6hiOw== damian@prime8.dev"