Reorganize nginx configs

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>

8 files changed, 8 insertions, 11 deletions

diff --git a/nginx_base.sls b/nginx/base.sls
index 10f39b3..10f39b3 100644
--- a/nginx_base.sls
+++ b/nginx/base.sls
diff --git a/theos/nginx/git_kyriasis_com.sls b/nginx/git_kyriasis_com.sls
index 78181a5..78181a5 100644
--- a/theos/nginx/git_kyriasis_com.sls
+++ b/nginx/git_kyriasis_com.sls
diff --git a/theos/nginx/matrix_kyriasis_com.sls b/nginx/matrix_kyriasis_com.sls
index a511dd2..a511dd2 100644
--- a/theos/nginx/matrix_kyriasis_com.sls
+++ b/nginx/matrix_kyriasis_com.sls
diff --git a/theos/nginx/riot_kyriasis_com.sls b/nginx/riot_kyriasis_com.sls
index 7f2b0c0..7f2b0c0 100644
--- a/theos/nginx/riot_kyriasis_com.sls
+++ b/nginx/riot_kyriasis_com.sls
diff --git a/theos/nginx/theos_kyriasis_com.sls b/nginx/theos_kyriasis_com.sls
index 23b678d..23b678d 100644
--- a/theos/nginx/theos_kyriasis_com.sls
+++ b/nginx/theos_kyriasis_com.sls
diff --git a/theos/nginx/xan_kyriasis_com.sls b/nginx/xan_kyriasis_com.sls
index 52a7cca..52a7cca 100644
--- a/theos/nginx/xan_kyriasis_com.sls
+++ b/nginx/xan_kyriasis_com.sls
diff --git a/theos/init.sls b/theos/init.sls
deleted file mode 100644
index 6970624..0000000
--- a/theos/init.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-include:
-  - theos.nginx.theos_kyriasis_com
-  - theos.nginx.xan_kyriasis_com
-  - theos.nginx.git_kyriasis_com
-  - theos.nginx.matrix_kyriasis_com
-  - theos.nginx.riot_kyriasis_com
-  - theos.opensmtpd
-
-# vim: set ft=yaml et:
diff --git a/top.sls b/top.sls
index f5f5575..1042108 100644
--- a/top.sls
+++ b/top.sls
@@ -1,6 +1,12 @@
 base:
   'theos.kyriasis.com':
-    - nginx_base
-    - theos
+    - nginx.base
+    - nginx.theos_kyriasis_com
+    - nginx.xan_kyriasis_com
+    - nginx.git_kyriasis_com
+    - nginx.matrix_kyriasis_com
+    - nginx.riot_kyriasis_com
+
+    - theos.opensmtpd
 
 # vim: set ft=yaml et: