added server 1 and 2 to salt

cloyne · Jan 29, 2017 · 969a177 · 969a177
1 parent 6cdc4ff
commit 969a177
Show file tree

Hide file tree

Showing 21 changed files with 399 additions and 2 deletions.
diff --git a/config/roster b/config/roster
@@ -1,3 +1,13 @@
+server1:
+  host: 64.62.133.43
+  port: 22
+  user: cloyne
+  sudo: True
+server2:
+  host: 64.62.133.44
+  port: 22
+  user: cloyne
+  sudo: True
 server3:
   host: server3.cloyne.net
   port: 22

diff --git a/pillars/server1/docker/dns.sls b/pillars/server1/docker/dns.sls
@@ -0,0 +1,22 @@
+docker:
+  containers:
+    dns:
+      image: cloyne/powerdns-slave
+      network_mode:
+        name: server1.cloyne.org
+      ports:
+        53/tcp:
+          ip:
+            type: pillar
+            key: network:interfaces:eth0:ipv4:0:address
+          port: 53
+        53/udp:
+          ip:
+            type: pillar
+            key: network:interfaces:eth0:ipv4:0:address
+          port: 53
+      volumes:
+        /srv/dns/powerdns/log:
+          bind: /var/log/powerdns
+          user: nobody
+          group: nogroup
diff --git a/pillars/server1/docker/init.sls b/pillars/server1/docker/init.sls
@@ -0,0 +1,4 @@
+docker.version: auto
+
+include:
+  - server1.docker.dns
diff --git a/pillars/server1/init.sls b/pillars/server1/init.sls
@@ -0,0 +1,3 @@
+include:
+  - server1.network
+  - server1.docker
diff --git a/pillars/server1/network.sls b/pillars/server1/network.sls
@@ -0,0 +1,21 @@
+network:
+  system:
+    hostname: server1
+    fqdn: server1.cloyne.net
+  dns:
+    ipv4:
+      - 216.218.196.2
+  interfaces:
+    eth0:
+      ipv4:
+        - type: static
+          address: 64.62.133.43
+          netmask: 255.255.255.248
+          gateway: 64.62.133.42
+mailer:
+  other_hostnames: server1.cloyne.net
+  local_interfaces: 127.0.0.1 ; ::1
+  relay: mail.cloyne.net
+  root_alias:
+    - [email protected]
+    - [email protected]
diff --git a/pillars/server2/docker/blog.sls b/pillars/server2/docker/blog.sls
@@ -0,0 +1,29 @@
+docker:
+  containers:
+    blog:
+      image: cloyne/blog
+      network_mode:
+        name: server2.cloyne.org
+      environment:
+        VIRTUAL_HOST: cloyne.org
+        VIRTUAL_ALIAS: /
+        VIRTUAL_LETSENCRYPT: true
+        SET_REAL_IP_FROM: 172.19.0.0/16
+        ADMINADDR:
+          type: pillar
+          key: mailer:root_alias
+          join: ','
+        REMOTES:
+          type: pillar
+          key: mailer:relay
+      volumes:
+        /srv/blog/etc:
+          bind: /etc/wordpress
+        /srv/var/log/blog:
+          bind: /var/log/nginx
+          user: nobody
+          group: nogroup
+        /srv/blog/uploads:
+          bind: /wordpress/wp-content/uploads
+      dependencies:
+        - mysql
diff --git a/pillars/server2/docker/dns.sls b/pillars/server2/docker/dns.sls
@@ -0,0 +1,22 @@
+docker:
+  containers:
+    dns:
+      image: cloyne/powerdns-master
+      network_mode:
+        name: server2.cloyne.org
+      ports:
+        53/tcp:
+          ip:
+            type: pillar
+            key: network:interfaces:eth0:ipv4:0:address
+          port: 53
+        53/udp:
+          ip:
+            type: pillar
+            key: network:interfaces:eth0:ipv4:0:address
+          port: 53
+      volumes:
+        /srv/var/log/powerdns:
+          bind: /var/log/powerdns
+          user: nobody
+          group: nogroup
diff --git a/pillars/server2/docker/init.sls b/pillars/server2/docker/init.sls
@@ -0,0 +1,14 @@
+docker.version: auto
+
+include:
+  - server2.docker.dns
+  - server2.docker.iperf
+  - server2.docker.pgsql
+  - server2.docker.mysql
+  - server2.docker.web
+  - server2.docker.phpmyadmin
+  - server2.docker.phppgadmin
+  - server2.docker.blog
+  - server2.docker.mail
+  - server2.docker.sympa
+  - server2.docker.radio
diff --git a/pillars/server2/docker/iperf.sls b/pillars/server2/docker/iperf.sls
@@ -0,0 +1,12 @@
+docker:
+  containers:
+    iperf:
+      image: tozd/iperf
+      network_mode:
+        name: server2.cloyne.org
+      ports:
+        5001/tcp:
+          ip:
+            type: pillar
+            key: network:interfaces:eth1:ipv4:0:address
+          port: 5001
diff --git a/pillars/server2/docker/mail.sls b/pillars/server2/docker/mail.sls
@@ -0,0 +1,39 @@
+docker:
+  containers:
+    mail:
+      image: cloyne/postfix
+      network_mode:
+        name: server2.cloyne.org
+      ports:
+        25/tcp:
+          ip:
+            type: pillar
+            key: network:interfaces:eth0:ipv4:0:address
+          port: 25
+        465/tcp:
+          ip:
+            type: pillar
+            key: network:interfaces:eth0:ipv4:0:address
+          port: 465
+        587/tcp:
+          ip:
+            type: pillar
+            key: network:interfaces:eth0:ipv4:0:address
+          port: 587
+      environment:
+        MAILNAME:
+          type: pillar
+          key: mailer:relay
+        MY_NETWORKS: 10.20.32.0/22 172.17.0.0/16 172.19.0.0/16 64.62.133.40/29 127.0.0.0/8
+        ROOT_ALIAS:
+          type: pillar
+          key: mailer:root_alias
+          join: ","
+        MY_DESTINATION: localhost.localdomain, localhost, mail.cloyne.net
+      volumes:
+        /srv/sympa/etc/shared:
+          bind: /etc/sympa/shared
+        /srv/var/log/postfix:
+          bind: /var/log/postfix
+        /srv/postfix:
+          bind: /var/spool/postfix
diff --git a/pillars/server2/docker/mysql.sls b/pillars/server2/docker/mysql.sls
@@ -0,0 +1,11 @@
+docker:
+  containers:
+    mysql:
+      image: cloyne/mysql
+      network_mode:
+        name: server2.cloyne.org
+      volumes:
+        /srv/mysql:
+          bind: /var/lib/mysql
+        /srv/var/log/mysql:
+          bind: /var/log/mysql
diff --git a/pillars/server2/docker/pgsql.sls b/pillars/server2/docker/pgsql.sls
@@ -0,0 +1,11 @@
+docker:
+  containers:
+    pgsql:
+      image: cloyne/postgresql
+      network_mode:
+        name: server2.cloyne.org
+      volumes:
+        /srv/postgresql:
+          bind: /var/lib/postgresql
+        /srv/var/log/postgresql:
+          bind: /var/log/postgresql
diff --git a/pillars/server2/docker/phpmyadmin.sls b/pillars/server2/docker/phpmyadmin.sls
@@ -0,0 +1,24 @@
+docker:
+  containers:
+    phpmyadmin:
+      image: cloyne/phpmyadmin
+      network_mode:
+        name: server2.cloyne.org
+      environment:
+        VIRTUAL_HOST: cloyne.org
+        VIRTUAL_ALIAS: /phpmyadmin/
+        SET_REAL_IP_FROM: 172.19.0.0/16
+        ADMINADDR:
+          type: pillar
+          key: mailer:root_alias
+          join: ','
+        REMOTES:
+          type: pillar
+          key: mailer:relay
+      volumes:
+        /srv/var/log/phpmyadmin:
+          bind: /var/log/nginx
+          user: nobody
+          group: nogroup
+      dependencies:
+        - mysql
diff --git a/pillars/server2/docker/phppgadmin.sls b/pillars/server2/docker/phppgadmin.sls
@@ -0,0 +1,24 @@
+docker:
+  containers:
+    phppgadmin:
+      image: cloyne/phppgadmin
+      network_mode:
+        name: server2.cloyne.org
+      environment:
+        VIRTUAL_HOST: cloyne.org
+        VIRTUAL_ALIAS: /phppgadmin/
+        SET_REAL_IP_FROM: 172.19.0.0/16
+        ADMINADDR:
+          type: pillar
+          key: mailer:root_alias
+          join: ','
+        REMOTES:
+          type: pillar
+          key: mailer:relay
+      volumes:
+        /srv/var/log/phppgadmin:
+          bind: /var/log/nginx
+          user: nobody
+          group: nogroup
+      dependencies:
+        - pgsql
diff --git a/pillars/server2/docker/radio.sls b/pillars/server2/docker/radio.sls
@@ -0,0 +1,32 @@
+docker:
+  containers:
+    radio_mongodb:
+      image: tozd/meteor-mongodb
+      tag: 2.6
+      network_mode:
+        name: server2.cloyne.org
+      volumes:
+        /srv/radio/mongodb/data:
+          bind: /var/lib/mongodb
+        /srv/radio/mongodb/log:
+          bind: /var/log/mongodb
+        /srv/radio/run.config:
+          bind: /etc/service/mongod/run.config
+          type: file
+    radio:
+      image: mitar/radio-app
+      network_mode:
+        name: server2.cloyne.org
+      environment:
+        VIRTUAL_HOST: radio.cloyne.net
+        VIRTUAL_URL: /
+        ROOT_URL: http://radio.cloyne.net
+        MAIL_URL: smtp://mail.cloyne.net
+      volumes:
+        /srv/radio/run.config:
+          bind: /etc/service/meteor/run.config
+          type: file
+        /srv/radio/meteor/log:
+          bind: /var/log/meteor
+      dependencies:
+        - radio_mongodb
diff --git a/pillars/server2/docker/sympa.sls b/pillars/server2/docker/sympa.sls
@@ -0,0 +1,27 @@
+docker:
+  containers:
+    sympa:
+      image: cloyne/sympa
+      network_mode:
+        name: server2.cloyne.org
+      environment:
+        VIRTUAL_HOST: cloyne.org
+        VIRTUAL_ALIAS: /lists,/lists-static/
+        SET_REAL_IP_FROM: 172.19.0.0/16
+        REMOTES: mail
+      volumes:
+        /srv/sympa/etc/shared:
+          bind: /etc/sympa/shared
+        /srv/var/log/sympa:
+          bind: /var/log/sympa
+        /srv/sympa/data:
+          bind: /var/lib/sympa
+        /srv/sympa/nullmailer:
+          bind: /var/spool/nullmailer
+        /srv/sympa/spool:
+          bind: /var/spool/sympa
+        /srv/sympa/etc/includes:
+          bind: /etc/sympa/includes
+      dependencies:
+        - mail
+        - pgsql
diff --git a/pillars/server2/docker/web.sls b/pillars/server2/docker/web.sls
@@ -0,0 +1,56 @@
+docker:
+  containers:
+    web:
+      image: cloyne/web
+      network_mode:
+        name: server2.cloyne.org
+      ports:
+        80/tcp:
+          ip:
+            type: pillar
+            key: network:interfaces:eth0:ipv4:0:address
+          port: 80
+        443/tcp:
+          ip:
+            type: pillar
+            key: network:interfaces:eth0:ipv4:0:address
+          port: 443
+      environment:
+        ADMINADDR:
+          type: pillar
+          key: mailer:root_alias
+          join: ','
+        MAILTO:
+          type: pillar
+          key: mailer:root_alias
+          join: ','
+        REMOTES: 
+          type: pillar
+          key: mailer:relay
+        LETSENCRYPT_EMAIL: [email protected]
+      volumes:
+        /srv/var/log/letsencrypt:
+          bind: /var/log/letsencrypt
+          user: nobody
+          group: nogroup
+        /srv/web/sites:
+          bind: /etc/nginx/sites-volume
+          user: root
+          group: root
+        /srv/web/ssl:
+          bind: /ssl
+          user: root
+          group: root
+          mode: 701
+        /var/run/docker.sock:
+          bind: /var/run/docker.sock
+          type: socket
+          readonly: True
+        /srv/var/log/nginx:
+          bind: /var/log/nginx
+          user: nobody
+          group: nogroup
+        /srv/var/log/dockergen:
+          bind: /var/log/dockergen
+          user: nobody
+          group: nogroup
diff --git a/pillars/server2/init.sls b/pillars/server2/init.sls
@@ -0,0 +1,3 @@
+include:
+  - server2.network
+  - server2.docker