Author: sandervanderburg
Date: Tue Oct 4 14:58:58 2011
New Revision: 29636
URL: https://ssl.nixos.org/websvn/nix/?rev=29636&sc=1
Log:
Added some inter-dependencies and Disnix models
Added:
disnix/examples/WebServicesExample.NET/trunk/deployment/DistributedDeployment/
disnix/examples/WebServicesExample.NET/trunk/deployment/DistributedDeployment/infrastructure.nix
disnix/examples/WebServicesExample.NET/trunk/deployment/DistributedDeployment/services.nix
Modified:
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webapplications/StaffTracker/default.nix
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/RoomService/default.nix
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/StaffService/default.nix
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/ZipcodeService/default.nix
Added:
disnix/examples/WebServicesExample.NET/trunk/deployment/DistributedDeployment/infrastructure.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
disnix/examples/WebServicesExample.NET/trunk/deployment/DistributedDeployment/infrastructure.nix
Tue Oct 4 14:58:58 2011 (r29636)
@@ -0,0 +1,7 @@
+{
+ test1 = {
+ hostname = "localhost";
+ msSqlUsername = "sa";
+ msSqlPassword = "admin123$";
+ };
+}
Added:
disnix/examples/WebServicesExample.NET/trunk/deployment/DistributedDeployment/services.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
disnix/examples/WebServicesExample.NET/trunk/deployment/DistributedDeployment/services.nix
Tue Oct 4 14:58:58 2011 (r29636)
@@ -0,0 +1,75 @@
+{distribution, system, pkgs}:
+
+let customPkgs = import ../top-level/all-packages.nix { inherit system pkgs; };
+in
+rec {
+### Databases
+
+ rooms = {
+ name = "rooms";
+ pkg = customPkgs.rooms;
+ dependsOn = {};
+ type = "mssql-database";
+ };
+
+ staff = {
+ name = "staff";
+ pkg = customPkgs.staff;
+ dependsOn = {};
+ type = "mssql-database";
+ };
+
+ zipcodes = {
+ name = "zipcodes";
+ pkg = customPkgs.zipcodes;
+ dependsOn = {};
+ type = "mssql-database";
+ };
+
+### Web services
+
+ GeolocationService = {
+ name = "GeolocationService";
+ pkg = customPkgs.GeolocationService;
+ dependsOn = {};
+ type = "iis-webapplication";
+ };
+
+ RoomService = {
+ name = "RoomService";
+ pkg = customPkgs.RoomService;
+ dependsOn = {
+ inherit rooms;
+ };
+ type = "iis-webapplication";
+ };
+
+ StaffService = {
+ name = "StaffService";
+ pkg = customPkgs.StaffService;
+ dependsOn = {
+ inherit staff;
+ };
+ type = "iis-webapplication";
+ };
+
+ ZipcodeService = {
+ name = "ZipcodeService";
+ pkg = customPkgs.ZipcodeService;
+ dependsOn = {
+ inherit zipcodes;
+ };
+ type = "iis-webapplication";
+ };
+
+### Web applications
+
+ StaffTracker = {
+ name = "StaffTracker";
+ pkg = customPkgs.StaffTracker;
+ dependsOn = {
+ inherit GeolocationService RoomService StaffService ZipcodeService;
+ };
+ type = "iis-webapplication";
+ };
+}
Modified:
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webapplications/StaffTracker/default.nix
==============================================================================
---
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webapplications/StaffTracker/default.nix
Tue Oct 4 14:58:28 2011 (r29635)
+++
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webapplications/StaffTracker/default.nix
Tue Oct 4 14:58:58 2011 (r29636)
@@ -1,3 +1,4 @@
+{GeolocationService, RoomService, StaffService, ZipcodeService}:
{dotnetenv}:
dotnetenv.buildSolution {
@@ -6,4 +7,7 @@
baseDir = "StaffTracker";
slnFile = "StaffTracker.csproj";
targets="Package";
+ preBuild = ''
+
+ '';
}
Modified:
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/RoomService/default.nix
==============================================================================
---
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/RoomService/default.nix
Tue Oct 4 14:58:28 2011 (r29635)
+++
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/RoomService/default.nix
Tue Oct 4 14:58:58 2011 (r29636)
@@ -1,3 +1,4 @@
+{rooms}:
{dotnetenv}:
dotnetenv.buildSolution {
@@ -6,4 +7,10 @@
baseDir = "RoomService";
slnFile = "RoomService.csproj";
targets = "Package";
+ preBuild = ''
+ sed -e 's|.\SQLEXPRESS|${rooms.target.hostname}\SQLEXPRESS|' \
+ -e 's|Initial Catalog=rooms|Initial catalog=${rooms.name}|' \
+ -e 's|User ID=sa|User ID=${rooms.target.msSqlUsername}|' \
+ -e 's|Password=admin123$|Password=${rooms.target.msSqlPassword}|'
Web.config
+ '';
}
Modified:
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/StaffService/default.nix
==============================================================================
---
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/StaffService/default.nix
Tue Oct 4 14:58:28 2011 (r29635)
+++
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/StaffService/default.nix
Tue Oct 4 14:58:58 2011 (r29636)
@@ -1,3 +1,4 @@
+{staff}:
{dotnetenv}:
dotnetenv.buildSolution {
@@ -6,4 +7,11 @@
baseDir = "StaffService";
slnFile = "StaffService.csproj";
targets = "Package";
+ preBuild = ''
+ sed -e 's|.\SQLEXPRESS|${staff.target.hostname}\SQLEXPRESS|' \
+ -e 's|Initial Catalog=staff|Initial catalog=${staff.name}|' \
+ -e 's|User ID=sa|User ID=${staff.target.msSqlUsername}|' \
+ -e 's|Password=admin123$|Password=${staff.target.msSqlPassword}|'
Web.config
+ '';
+
}
Modified:
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/ZipcodeService/default.nix
==============================================================================
---
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/ZipcodeService/default.nix
Tue Oct 4 14:58:28 2011 (r29635)
+++
disnix/examples/WebServicesExample.NET/trunk/deployment/pkgs/webservices/ZipcodeService/default.nix
Tue Oct 4 14:58:58 2011 (r29636)
@@ -1,3 +1,4 @@
+{zipcodes}:
{dotnetenv}:
dotnetenv.buildSolution {
@@ -6,4 +7,10 @@
baseDir = "ZipcodeService";
slnFile = "ZipcodeService.csproj";
targets = "Package";
+ preBuild = ''
+ sed -e 's|.\SQLEXPRESS|${zipcodes.target.hostname}\SQLEXPRESS|' \
+ -e 's|Initial Catalog=zipcodes|Initial catalog=${zipcodes.name}|' \
+ -e 's|User ID=sa|User ID=${zipcodes.target.msSqlUsername}|' \
+ -e 's|Password=admin123$|Password=${zipcodes.target.msSqlPassword}|'
Web.config
+ '';
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
