From 3ced3ff1223f28d17168330e8981dd13da52b925 Mon Sep 17 00:00:00 2001
From: Drago Draganov <dragod@microsoft.com>
Date: Wed, 31 May 2017 16:56:12 -0700
Subject: [PATCH] Move config and set defaults

---
 .../config/api-keys.default.json              |  0
 .../config/appsettings.default.json           | 19 ++++---
 .../config/appsettings.json                   | 54 -------------------
 .../{modules.json => modules.default.json}    |  0
 4 files changed, 13 insertions(+), 60 deletions(-)
 rename scripts/publish/empty-api-keys.json => src/Microsoft.IIS.Administration/config/api-keys.default.json (100%)
 rename scripts/publish/defaultAppSettings.json => src/Microsoft.IIS.Administration/config/appsettings.default.json (57%)
 delete mode 100644 src/Microsoft.IIS.Administration/config/appsettings.json
 rename src/Microsoft.IIS.Administration/config/{modules.json => modules.default.json} (100%)

diff --git a/scripts/publish/empty-api-keys.json b/src/Microsoft.IIS.Administration/config/api-keys.default.json
similarity index 100%
rename from scripts/publish/empty-api-keys.json
rename to src/Microsoft.IIS.Administration/config/api-keys.default.json
diff --git a/scripts/publish/defaultAppSettings.json b/src/Microsoft.IIS.Administration/config/appsettings.default.json
similarity index 57%
rename from scripts/publish/defaultAppSettings.json
rename to src/Microsoft.IIS.Administration/config/appsettings.default.json
index 75878c8..9971d76 100644
--- a/scripts/publish/defaultAppSettings.json
+++ b/src/Microsoft.IIS.Administration/config/appsettings.default.json
@@ -1,19 +1,26 @@
 {
   "host_id": "",
   "host_name": "IIS Administration API",
-  "administrators": [
-    "Administrators",
-    "IIS Administrators"
-  ],
+  "security": {
+    "users": {
+      "administrators": [
+      ],
+      "owners": [
+      ]
+    },
+    "access_policy": {
+      "api": "users:administrators+AccessKey",
+      "api_keys": "users:administrators",
+      "system": "users:owners+AccessKey"
+    }
+  },
   "logging": {
     "enabled": true,
-    "path": null,
     "min_level": "error",
     "file_name": "log-{Date}.txt"
   },
   "auditing": {
     "enabled": true,
-    "path": null,
     "file_name": "audit-{Date}.txt"
   },
   "cors": {
diff --git a/src/Microsoft.IIS.Administration/config/appsettings.json b/src/Microsoft.IIS.Administration/config/appsettings.json
deleted file mode 100644
index e273afb..0000000
--- a/src/Microsoft.IIS.Administration/config/appsettings.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "host_id": "",
-  "host_name": "IIS Administration API",
-  "administrators": [
-    "Administrators",
-    "IIS Administrators"
-  ],
-  "logging": {
-    "enabled": true,
-    "file_name": "log-{Date}.txt",
-    "min_level": "Error",
-    "path": null
-  },
-  "auditing": {
-    "enabled": true,
-    "file_name": "audit-{Date}.txt",
-    "path": null
-  },
-  "cors": {
-    "rules": [
-      {
-        "origin": "https://manage.iis.net",
-        "allow": true
-      }
-    ]
-  },
-  "files": {
-    "locations": [
-      {
-        "alias": "inetpub",
-        "path": "%systemdrive%\\inetpub",
-        "claims": [
-          "read",
-          "write"
-        ]
-      },
-      {
-        "alias": "tests",
-        "path": "%iis_admin_solution_dir%\\test\\Microsoft.IIS.Administration.Tests\\bin\\Debug",
-        "claims": [
-          "read",
-          "write"
-        ]
-      },
-      {
-        "alias": "DevCertStore",
-        "path": "%iis_admin_solution_dir%\\test\\CentralCertStore",
-        "claims": [
-          "read"
-        ]
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/src/Microsoft.IIS.Administration/config/modules.json b/src/Microsoft.IIS.Administration/config/modules.default.json
similarity index 100%
rename from src/Microsoft.IIS.Administration/config/modules.json
rename to src/Microsoft.IIS.Administration/config/modules.default.json