Commit uncommitted changes to webdsl configuration.nix
svn path=/configurations/trunk/tud/; revision=34455
Rob Vermaas committed
Jun 11, 2012 at 13:01 UTC
c75dc56a432b94d51eb6f624ab542cfde6ac29f0
1 file changed
+6
-32
webdsl.nix
+6
-32
@@ -60,10 +60,6 @@ in
60
UserParameter=mysql_threads,${pkgs.mysql}/bin/mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
61
UserParameter=mysql_questions,${pkgs.mysql}/bin/mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
62
UserParameter=mysql_qps,${pkgs.mysql}/bin/mysqladmin -uroot status|cut -f9 -d":"
63
- UserParameter=hydra.queue.total,${pkgs.postgresql}/bin/psql hydra -At -c 'select count(*) from builds where finished = 0'
64
- UserParameter=hydra.queue.building,${pkgs.postgresql}/bin/psql hydra -At -c 'select count(*) from builds natural join BuildSchedulingInfo where finished = 0 and busy = 1'
65
- UserParameter=hydra.queue.buildsteps,${pkgs.postgresql}/bin/psql hydra -At -c 'select count(*) from BuildSteps s join BuildSchedulingInfo i on s.build = i.id where i.busy = 1 and s.busy = 1'
66
- UserParameter=hydra.builds,${pkgs.postgresql}/bin/psql hydra -At -c 'select count(*) from Builds'
63
'';
64
65
services.systemhealth = {
@@ -80,35 +76,12 @@ in
76
anonymousUser = true;
77
};
78
83
- services.sitecopy = {
84
- enable = true;
85
- backups =
86
- let genericBackup = { server = "webdata.tudelft.nl";
87
- protocol = "webdav";
88
- https = true ;
89
- };
90
- in [
91
- ( genericBackup // { name = "ftp"; local = "/home/ftp"; remote = "/staff-groups/ewi/st/strategoxt/backup/ftp/ftp.strategoxt.org/"; } )
92
- ( genericBackup // { name = "mysql"; local = config.services.mysqlBackup.location; remote = "/staff-groups/ewi/st/strategoxt/backup/mysql"; } )
93
- ( genericBackup // { name = "tomcat"; local = config.services.tomcat.baseDir; remote = "/staff-groups/ewi/st/strategoxt/backup/tomcat"; } )
94
- ( genericBackup // { name = "postgresql";
95
- local = config.services.postgresqlBackup.location;
96
- remote = "/staff-groups/ewi/st/strategoxt/backup/postgresql-webdsl.org";
97
- } )
98
- ];
99
- };
100
-
79
services.mysql = {
80
enable = true;
81
package = pkgs.mysql51;
82
dataDir = "/data/mysql";
83
};
84
107
- services.postgresqlBackup = {
108
- enable = true;
109
- databases = [ "hydra" "jira" "mediawiki" ];
110
- };
111
-
85
services.syslogd.extraConfig = ''
86
local0.* -/var/log/pgsql
87
'';
@@ -118,9 +91,9 @@ in
91
enableTCPIP = true;
92
dataDir = "/data/postgresql";
93
extraConfig = ''
121
- log_min_duration_statement = 1000
122
- log_duration = off
123
- log_statement = 'none'
94
+ #log_min_duration_statement = 1000
95
+ #log_duration = off
96
+ #log_statement = 'none'
97
max_connections = 250
98
'';
99
authentication = ''
@@ -268,7 +241,7 @@ JkMount /* loadbalancer
241
services.mysqlBackup = {
242
enable = true;
243
user = "root";
271
- databases = [ "researchr" "twitterarchive" "webdslorg" "pilweb" "mysql" "yellowgrass" "department" ];
244
+ databases = [ "researchr" "twitterarchive" "webdslorg" "pilweb" "mysql" "yellowgrass" "department" "weblab" ];
245
singleTransaction = true;
246
split = true;
247
extraArgs = "--ignore-table=researchr._SecurityContext --ignore-table=researchr.RequestLogEntry_params_RequestLogEntryParam --ignore-table=researchr._RequestLogEntry --ignore-table=researchr._RequestLogEntryParam --ignore-table=researchr._RequestLogEntry --ignore-table=researchr._RequestLogEntryParam --ignore-table=researchr.RequestLogEntry_params_RequestLogEntryParam";
@@ -343,6 +316,7 @@ JkMount /* loadbalancer
316
services.cron.systemCronJobs =
317
[ "15 03 * * * root ${pkgs.nixUnstable}/bin/nix-collect-garbage --max-freed $((32 * 1024**3)) > /var/log/gc.log 2>&1"
318
"* * * * * root ${pkgs.python}/bin/python ${ZabbixApacheUpdater} -z buildfarm.st.ewi.tudelft.nl -c webdsl"
319
+ "05 05 * * * root cp -v /var/backup/mysql/* /backup/webdsl/mysql/"
320
];
321
322
networking = {
@@ -366,5 +340,5 @@ JkMount /* loadbalancer
340
341
};
342
369
- environment.systemPackages = [ pkgs.stdenv /*pkgs.lsiutil*/ ] ++ (with pkgs.strategoPackages018; [ aterm sdf strategoxt ]) ;
343
+ environment.systemPackages = [ pkgs.stdenv pkgs.clang pkgs.llvm /*pkgs.lsiutil*/ ] ++ (with pkgs.strategoPackages018; [ aterm sdf strategoxt ]) ;
344
}