aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nixops/modules/websites/default.nix85
-rw-r--r--pkgs/webapps/apache-theme/default.nix86
-rw-r--r--pkgs/webapps/apache-theme/theme/.htaccess (renamed from nixops/modules/websites/apache/theme/.htaccess)0
-rw-r--r--pkgs/webapps/apache-theme/theme/footer.html (renamed from nixops/modules/websites/apache/theme/footer.html)0
-rw-r--r--pkgs/webapps/apache-theme/theme/header.html (renamed from nixops/modules/websites/apache/theme/header.html)0
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/archive.png (renamed from nixops/modules/websites/apache/theme/icons/archive.png)bin551 -> 551 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/audio.png (renamed from nixops/modules/websites/apache/theme/icons/audio.png)bin554 -> 554 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/authors.png (renamed from nixops/modules/websites/apache/theme/icons/authors.png)bin492 -> 492 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/bin.png (renamed from nixops/modules/websites/apache/theme/icons/bin.png)bin551 -> 551 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/blank.png (renamed from nixops/modules/websites/apache/theme/icons/blank.png)bin227 -> 227 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/bmp.png (renamed from nixops/modules/websites/apache/theme/icons/bmp.png)bin663 -> 663 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/c.png (renamed from nixops/modules/websites/apache/theme/icons/c.png)bin554 -> 554 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/calc.png (renamed from nixops/modules/websites/apache/theme/icons/calc.png)bin506 -> 506 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/cd.png (renamed from nixops/modules/websites/apache/theme/icons/cd.png)bin757 -> 757 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/copying.png (renamed from nixops/modules/websites/apache/theme/icons/copying.png)bin699 -> 699 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/cpp.png (renamed from nixops/modules/websites/apache/theme/icons/cpp.png)bin599 -> 599 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/css.png (renamed from nixops/modules/websites/apache/theme/icons/css.png)bin592 -> 592 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/deb.png (renamed from nixops/modules/websites/apache/theme/icons/deb.png)bin671 -> 671 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/default.png (renamed from nixops/modules/websites/apache/theme/icons/default.png)bin311 -> 311 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/diff.png (renamed from nixops/modules/websites/apache/theme/icons/diff.png)bin586 -> 586 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/doc.png (renamed from nixops/modules/websites/apache/theme/icons/doc.png)bin535 -> 535 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/draw.png (renamed from nixops/modules/websites/apache/theme/icons/draw.png)bin679 -> 679 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/eps.png (renamed from nixops/modules/websites/apache/theme/icons/eps.png)bin619 -> 619 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/exe.png (renamed from nixops/modules/websites/apache/theme/icons/exe.png)bin846 -> 846 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/folder-home.png (renamed from nixops/modules/websites/apache/theme/icons/folder-home.png)bin618 -> 618 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/folder-open.png (renamed from nixops/modules/websites/apache/theme/icons/folder-open.png)bin431 -> 431 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/folder-page.png (renamed from nixops/modules/websites/apache/theme/icons/folder-page.png)bin591 -> 591 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png (renamed from nixops/modules/websites/apache/theme/icons/folder-parent-old.png)bin494 -> 494 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/folder-parent.png (renamed from nixops/modules/websites/apache/theme/icons/folder-parent.png)bin621 -> 621 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/folder.png (renamed from nixops/modules/websites/apache/theme/icons/folder.png)bin395 -> 395 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/gif.png (renamed from nixops/modules/websites/apache/theme/icons/gif.png)bin655 -> 655 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/gzip.png (renamed from nixops/modules/websites/apache/theme/icons/gzip.png)bin551 -> 551 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/h.png (renamed from nixops/modules/websites/apache/theme/icons/h.png)bin504 -> 504 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/hpp.png (renamed from nixops/modules/websites/apache/theme/icons/hpp.png)bin530 -> 530 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/html.png (renamed from nixops/modules/websites/apache/theme/icons/html.png)bin770 -> 770 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/ico.png (renamed from nixops/modules/websites/apache/theme/icons/ico.png)bin792 -> 792 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/image.png (renamed from nixops/modules/websites/apache/theme/icons/image.png)bin671 -> 671 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/install.png (renamed from nixops/modules/websites/apache/theme/icons/install.png)bin788 -> 788 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/java.png (renamed from nixops/modules/websites/apache/theme/icons/java.png)bin658 -> 658 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/jpg.png (renamed from nixops/modules/websites/apache/theme/icons/jpg.png)bin675 -> 675 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/js.png (renamed from nixops/modules/websites/apache/theme/icons/js.png)bin540 -> 540 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/json.png (renamed from nixops/modules/websites/apache/theme/icons/json.png)bin540 -> 540 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/log.png (renamed from nixops/modules/websites/apache/theme/icons/log.png)bin423 -> 423 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/makefile.png (renamed from nixops/modules/websites/apache/theme/icons/makefile.png)bin614 -> 614 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/markdown.png (renamed from nixops/modules/websites/apache/theme/icons/markdown.png)bin627 -> 627 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/package.png (renamed from nixops/modules/websites/apache/theme/icons/package.png)bin614 -> 614 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/pdf.png (renamed from nixops/modules/websites/apache/theme/icons/pdf.png)bin799 -> 799 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/php.png (renamed from nixops/modules/websites/apache/theme/icons/php.png)bin757 -> 757 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/playlist.png (renamed from nixops/modules/websites/apache/theme/icons/playlist.png)bin610 -> 610 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/png.png (renamed from nixops/modules/websites/apache/theme/icons/png.png)bin679 -> 679 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/pres.png (renamed from nixops/modules/websites/apache/theme/icons/pres.png)bin629 -> 629 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/ps.png (renamed from nixops/modules/websites/apache/theme/icons/ps.png)bin817 -> 817 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/psd.png (renamed from nixops/modules/websites/apache/theme/icons/psd.png)bin622 -> 622 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/py.png (renamed from nixops/modules/websites/apache/theme/icons/py.png)bin743 -> 743 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/rar.png (renamed from nixops/modules/websites/apache/theme/icons/rar.png)bin621 -> 621 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/rb.png (renamed from nixops/modules/websites/apache/theme/icons/rb.png)bin781 -> 781 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/readme.png (renamed from nixops/modules/websites/apache/theme/icons/readme.png)bin384 -> 384 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/rpm.png (renamed from nixops/modules/websites/apache/theme/icons/rpm.png)bin660 -> 660 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/rss.png (renamed from nixops/modules/websites/apache/theme/icons/rss.png)bin660 -> 660 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/rtf.png (renamed from nixops/modules/websites/apache/theme/icons/rtf.png)bin627 -> 627 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/script.png (renamed from nixops/modules/websites/apache/theme/icons/script.png)bin613 -> 613 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/source.png (renamed from nixops/modules/websites/apache/theme/icons/source.png)bin586 -> 586 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/sql.png (renamed from nixops/modules/websites/apache/theme/icons/sql.png)bin510 -> 510 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/tar.png (renamed from nixops/modules/websites/apache/theme/icons/tar.png)bin406 -> 406 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/tex.png (renamed from nixops/modules/websites/apache/theme/icons/tex.png)bin677 -> 677 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/text.png (renamed from nixops/modules/websites/apache/theme/icons/text.png)bin463 -> 463 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/tiff.png (renamed from nixops/modules/websites/apache/theme/icons/tiff.png)bin654 -> 654 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/unknown.png (renamed from nixops/modules/websites/apache/theme/icons/unknown.png)bin556 -> 556 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/vcal.png (renamed from nixops/modules/websites/apache/theme/icons/vcal.png)bin556 -> 556 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/video.png (renamed from nixops/modules/websites/apache/theme/icons/video.png)bin739 -> 739 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/xml.png (renamed from nixops/modules/websites/apache/theme/icons/xml.png)bin585 -> 585 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/icons/zip.png (renamed from nixops/modules/websites/apache/theme/icons/zip.png)bin617 -> 617 bytes
-rw-r--r--pkgs/webapps/apache-theme/theme/style.css (renamed from nixops/modules/websites/apache/theme/style.css)0
-rw-r--r--pkgs/webapps/default.nix1
74 files changed, 89 insertions, 83 deletions
diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index 7ed00db..891d917 100644
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -305,88 +305,7 @@ in
305 ''; 305 '';
306 }; 306 };
307 apaxy = { 307 apaxy = {
308 extraConfig = '' 308 extraConfig = (pkgs.webapps.apache-theme.override { inherit theme_root; }).apacheConfig;
309 <Macro Apaxy %{folder} %{ignored}>
310 Alias /theme ${theme_root}
311 <Directory ${theme_root}>
312 Options -Indexes
313 AllowOverride None
314 Require all granted
315 </Directory>
316
317 # mod_autoindex
318 <Directory %{folder}>
319 Options Indexes
320 AllowOverride None
321 Require all granted
322
323 # Inspired from Apaxy by @adamwhitcroft
324
325 IndexOptions +Charset=UTF-8 +FancyIndexing +IgnoreCase +FoldersFirst +XHTML +HTMLTable +SuppressRules +SuppressDescription +NameWidth=* +IconsAreLinks +ShowForbidden
326
327 IndexHeadInsert "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />"
328
329 IndexIgnoreReset ON
330 IndexIgnore /theme .htaccess %{ignored}
331
332 AddIcon /theme/icons/blank.png ^^BLANKICON^^
333 AddIcon /theme/icons/folder.png ^^DIRECTORY^^
334 AddIcon /theme/icons/folder-home.png ..
335
336 AddIconByType (TXT,/theme/icons/text.png) text/*
337 AddIconByType (IMG,/theme/icons/image.png) image/*
338 AddIconByType (SND,/theme/icons/audio.png) audio/*
339 AddIconByType (VID,/theme/icons/video.png) video/*
340
341 AddIcon /theme/icons/archive.png .7z .bz2 .cab .gz .tar
342 AddIcon /theme/icons/audio.png .aac .aif .aifc .aiff .ape .au .flac .iff .m4a .mid .mp3 .mpa .ra .wav .wma .f4a .f4b .oga .ogg .xm .it .s3m .mod
343 AddIcon /theme/icons/bin.png .bin .hex
344 AddIcon /theme/icons/bmp.png .bmp
345 AddIcon /theme/icons/c.png .c
346 AddIcon /theme/icons/calc.png .xlsx .xlsm .xltx .xltm .xlam .xlr .xls .csv
347 AddIcon /theme/icons/cd.png .iso
348 AddIcon /theme/icons/cpp.png .cpp
349 AddIcon /theme/icons/css.png .css .sass .scss
350 AddIcon /theme/icons/deb.png .deb
351 AddIcon /theme/icons/doc.png .doc .docx .docm .dot .dotx .dotm .log .msg .odt .pages .rtf .tex .wpd .wps
352 AddIcon /theme/icons/draw.png .svg .svgz
353 AddIcon /theme/icons/eps.png .ai .eps
354 AddIcon /theme/icons/exe.png .exe
355 AddIcon /theme/icons/gif.png .gif
356 AddIcon /theme/icons/h.png .h
357 AddIcon /theme/icons/html.png .html .xhtml .shtml .htm .URL .url
358 AddIcon /theme/icons/ico.png .ico
359 AddIcon /theme/icons/java.png .jar
360 AddIcon /theme/icons/jpg.png .jpg .jpeg .jpe
361 AddIcon /theme/icons/js.png .js .json
362 AddIcon /theme/icons/markdown.png .md
363 AddIcon /theme/icons/package.png .pkg .dmg
364 AddIcon /theme/icons/pdf.png .pdf
365 AddIcon /theme/icons/php.png .php .phtml
366 AddIcon /theme/icons/playlist.png .m3u .m3u8 .pls .pls8
367 AddIcon /theme/icons/png.png .png
368 AddIcon /theme/icons/ps.png .ps
369 AddIcon /theme/icons/psd.png .psd
370 AddIcon /theme/icons/py.png .py
371 AddIcon /theme/icons/rar.png .rar
372 AddIcon /theme/icons/rb.png .rb
373 AddIcon /theme/icons/rpm.png .rpm
374 AddIcon /theme/icons/rss.png .rss
375 AddIcon /theme/icons/script.png .bat .cmd .sh
376 AddIcon /theme/icons/sql.png .sql
377 AddIcon /theme/icons/tiff.png .tiff .tif
378 AddIcon /theme/icons/text.png .txt .nfo
379 AddIcon /theme/icons/video.png .asf .asx .avi .flv .mkv .mov .mp4 .mpg .rm .srt .swf .vob .wmv .m4v .f4v .f4p .ogv
380 AddIcon /theme/icons/xml.png .xml
381 AddIcon /theme/icons/zip.png .zip
382 DefaultIcon /theme/icons/default.png
383
384 HeaderName /theme/header.html
385 ReadmeName /theme/footer.html
386 IndexStyleSheet /theme/style.css
387 </Directory>
388 </Macro>
389 '';
390 }; 309 };
391 http2 = { 310 http2 = {
392 modules = [ "http2" ]; 311 modules = [ "http2" ];
@@ -418,7 +337,7 @@ in
418 in '' 337 in ''
419 mkdir -p $out/webapps 338 mkdir -p $out/webapps
420 ln -s ${../../www} $out/webapps/_www 339 ln -s ${../../www} $out/webapps/_www
421 ln -s ${./apache/theme} $out/webapps/_theme 340 ln -s ${pkgs.webapps.apache-theme.theme} $out/webapps/_theme
422 ln -s ${adminer.webRoot} $out/webapps/${adminer.apache.webappName} 341 ln -s ${adminer.webRoot} $out/webapps/${adminer.apache.webappName}
423 ''; 342 '';
424 343
diff --git a/pkgs/webapps/apache-theme/default.nix b/pkgs/webapps/apache-theme/default.nix
new file mode 100644
index 0000000..b679afe
--- /dev/null
+++ b/pkgs/webapps/apache-theme/default.nix
@@ -0,0 +1,86 @@
1{ theme_root ? null }:
2rec {
3 theme = ./theme;
4 apacheConfig = ''
5 <Macro Apaxy %{folder} %{ignored}>
6 Alias /theme ${if isNull theme_root then theme else theme_root}
7 <Directory ${if isNull theme_root then theme else theme_root}>
8 Options -Indexes
9 AllowOverride None
10 Require all granted
11 </Directory>
12
13 # mod_autoindex
14 <Directory %{folder}>
15 Options Indexes
16 AllowOverride None
17 Require all granted
18
19 # Inspired from Apaxy by @adamwhitcroft
20
21 IndexOptions +Charset=UTF-8 +FancyIndexing +IgnoreCase +FoldersFirst +XHTML +HTMLTable +SuppressRules +SuppressDescription +NameWidth=* +IconsAreLinks +ShowForbidden
22
23 IndexHeadInsert "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />"
24
25 IndexIgnoreReset ON
26 IndexIgnore /theme .htaccess %{ignored}
27
28 AddIcon /theme/icons/blank.png ^^BLANKICON^^
29 AddIcon /theme/icons/folder.png ^^DIRECTORY^^
30 AddIcon /theme/icons/folder-home.png ..
31
32 AddIconByType (TXT,/theme/icons/text.png) text/*
33 AddIconByType (IMG,/theme/icons/image.png) image/*
34 AddIconByType (SND,/theme/icons/audio.png) audio/*
35 AddIconByType (VID,/theme/icons/video.png) video/*
36
37 AddIcon /theme/icons/archive.png .7z .bz2 .cab .gz .tar
38 AddIcon /theme/icons/audio.png .aac .aif .aifc .aiff .ape .au .flac .iff .m4a .mid .mp3 .mpa .ra .wav .wma .f4a .f4b .oga .ogg .xm .it .s3m .mod
39 AddIcon /theme/icons/bin.png .bin .hex
40 AddIcon /theme/icons/bmp.png .bmp
41 AddIcon /theme/icons/c.png .c
42 AddIcon /theme/icons/calc.png .xlsx .xlsm .xltx .xltm .xlam .xlr .xls .csv
43 AddIcon /theme/icons/cd.png .iso
44 AddIcon /theme/icons/cpp.png .cpp
45 AddIcon /theme/icons/css.png .css .sass .scss
46 AddIcon /theme/icons/deb.png .deb
47 AddIcon /theme/icons/doc.png .doc .docx .docm .dot .dotx .dotm .log .msg .odt .pages .rtf .tex .wpd .wps
48 AddIcon /theme/icons/draw.png .svg .svgz
49 AddIcon /theme/icons/eps.png .ai .eps
50 AddIcon /theme/icons/exe.png .exe
51 AddIcon /theme/icons/gif.png .gif
52 AddIcon /theme/icons/h.png .h
53 AddIcon /theme/icons/html.png .html .xhtml .shtml .htm .URL .url
54 AddIcon /theme/icons/ico.png .ico
55 AddIcon /theme/icons/java.png .jar
56 AddIcon /theme/icons/jpg.png .jpg .jpeg .jpe
57 AddIcon /theme/icons/js.png .js .json
58 AddIcon /theme/icons/markdown.png .md
59 AddIcon /theme/icons/package.png .pkg .dmg
60 AddIcon /theme/icons/pdf.png .pdf
61 AddIcon /theme/icons/php.png .php .phtml
62 AddIcon /theme/icons/playlist.png .m3u .m3u8 .pls .pls8
63 AddIcon /theme/icons/png.png .png
64 AddIcon /theme/icons/ps.png .ps
65 AddIcon /theme/icons/psd.png .psd
66 AddIcon /theme/icons/py.png .py
67 AddIcon /theme/icons/rar.png .rar
68 AddIcon /theme/icons/rb.png .rb
69 AddIcon /theme/icons/rpm.png .rpm
70 AddIcon /theme/icons/rss.png .rss
71 AddIcon /theme/icons/script.png .bat .cmd .sh
72 AddIcon /theme/icons/sql.png .sql
73 AddIcon /theme/icons/tiff.png .tiff .tif
74 AddIcon /theme/icons/text.png .txt .nfo
75 AddIcon /theme/icons/video.png .asf .asx .avi .flv .mkv .mov .mp4 .mpg .rm .srt .swf .vob .wmv .m4v .f4v .f4p .ogv
76 AddIcon /theme/icons/xml.png .xml
77 AddIcon /theme/icons/zip.png .zip
78 DefaultIcon /theme/icons/default.png
79
80 HeaderName /theme/header.html
81 ReadmeName /theme/footer.html
82 IndexStyleSheet /theme/style.css
83 </Directory>
84 </Macro>
85 '';
86}
diff --git a/nixops/modules/websites/apache/theme/.htaccess b/pkgs/webapps/apache-theme/theme/.htaccess
index f9e5472..f9e5472 100644
--- a/nixops/modules/websites/apache/theme/.htaccess
+++ b/pkgs/webapps/apache-theme/theme/.htaccess
diff --git a/nixops/modules/websites/apache/theme/footer.html b/pkgs/webapps/apache-theme/theme/footer.html
index 57a2012..57a2012 100644
--- a/nixops/modules/websites/apache/theme/footer.html
+++ b/pkgs/webapps/apache-theme/theme/footer.html
diff --git a/nixops/modules/websites/apache/theme/header.html b/pkgs/webapps/apache-theme/theme/header.html
index cbded6a..cbded6a 100644
--- a/nixops/modules/websites/apache/theme/header.html
+++ b/pkgs/webapps/apache-theme/theme/header.html
diff --git a/nixops/modules/websites/apache/theme/icons/archive.png b/pkgs/webapps/apache-theme/theme/icons/archive.png
index 99ae6fc..99ae6fc 100644
--- a/nixops/modules/websites/apache/theme/icons/archive.png
+++ b/pkgs/webapps/apache-theme/theme/icons/archive.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/audio.png b/pkgs/webapps/apache-theme/theme/icons/audio.png
index a67618d..a67618d 100644
--- a/nixops/modules/websites/apache/theme/icons/audio.png
+++ b/pkgs/webapps/apache-theme/theme/icons/audio.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/authors.png b/pkgs/webapps/apache-theme/theme/icons/authors.png
index 78bf784..78bf784 100644
--- a/nixops/modules/websites/apache/theme/icons/authors.png
+++ b/pkgs/webapps/apache-theme/theme/icons/authors.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/bin.png b/pkgs/webapps/apache-theme/theme/icons/bin.png
index ec2220b..ec2220b 100644
--- a/nixops/modules/websites/apache/theme/icons/bin.png
+++ b/pkgs/webapps/apache-theme/theme/icons/bin.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/blank.png b/pkgs/webapps/apache-theme/theme/icons/blank.png
index bef1f60..bef1f60 100644
--- a/nixops/modules/websites/apache/theme/icons/blank.png
+++ b/pkgs/webapps/apache-theme/theme/icons/blank.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/bmp.png b/pkgs/webapps/apache-theme/theme/icons/bmp.png
index c6f3044..c6f3044 100644
--- a/nixops/modules/websites/apache/theme/icons/bmp.png
+++ b/pkgs/webapps/apache-theme/theme/icons/bmp.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/c.png b/pkgs/webapps/apache-theme/theme/icons/c.png
index 12adaa3..12adaa3 100644
--- a/nixops/modules/websites/apache/theme/icons/c.png
+++ b/pkgs/webapps/apache-theme/theme/icons/c.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/calc.png b/pkgs/webapps/apache-theme/theme/icons/calc.png
index a034367..a034367 100644
--- a/nixops/modules/websites/apache/theme/icons/calc.png
+++ b/pkgs/webapps/apache-theme/theme/icons/calc.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/cd.png b/pkgs/webapps/apache-theme/theme/icons/cd.png
index 3a3ffbb..3a3ffbb 100644
--- a/nixops/modules/websites/apache/theme/icons/cd.png
+++ b/pkgs/webapps/apache-theme/theme/icons/cd.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/copying.png b/pkgs/webapps/apache-theme/theme/icons/copying.png
index 83fa06e..83fa06e 100644
--- a/nixops/modules/websites/apache/theme/icons/copying.png
+++ b/pkgs/webapps/apache-theme/theme/icons/copying.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/cpp.png b/pkgs/webapps/apache-theme/theme/icons/cpp.png
index 47e8b1e..47e8b1e 100644
--- a/nixops/modules/websites/apache/theme/icons/cpp.png
+++ b/pkgs/webapps/apache-theme/theme/icons/cpp.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/css.png b/pkgs/webapps/apache-theme/theme/icons/css.png
index 15f7695..15f7695 100644
--- a/nixops/modules/websites/apache/theme/icons/css.png
+++ b/pkgs/webapps/apache-theme/theme/icons/css.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/deb.png b/pkgs/webapps/apache-theme/theme/icons/deb.png
index 1b12d29..1b12d29 100644
--- a/nixops/modules/websites/apache/theme/icons/deb.png
+++ b/pkgs/webapps/apache-theme/theme/icons/deb.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/default.png b/pkgs/webapps/apache-theme/theme/icons/default.png
index 6997229..6997229 100644
--- a/nixops/modules/websites/apache/theme/icons/default.png
+++ b/pkgs/webapps/apache-theme/theme/icons/default.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/diff.png b/pkgs/webapps/apache-theme/theme/icons/diff.png
index 5bef920..5bef920 100644
--- a/nixops/modules/websites/apache/theme/icons/diff.png
+++ b/pkgs/webapps/apache-theme/theme/icons/diff.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/doc.png b/pkgs/webapps/apache-theme/theme/icons/doc.png
index 5732f9b..5732f9b 100644
--- a/nixops/modules/websites/apache/theme/icons/doc.png
+++ b/pkgs/webapps/apache-theme/theme/icons/doc.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/draw.png b/pkgs/webapps/apache-theme/theme/icons/draw.png
index 8f1da5c..8f1da5c 100644
--- a/nixops/modules/websites/apache/theme/icons/draw.png
+++ b/pkgs/webapps/apache-theme/theme/icons/draw.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/eps.png b/pkgs/webapps/apache-theme/theme/icons/eps.png
index 93736bb..93736bb 100644
--- a/nixops/modules/websites/apache/theme/icons/eps.png
+++ b/pkgs/webapps/apache-theme/theme/icons/eps.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/exe.png b/pkgs/webapps/apache-theme/theme/icons/exe.png
index 31299b7..31299b7 100644
--- a/nixops/modules/websites/apache/theme/icons/exe.png
+++ b/pkgs/webapps/apache-theme/theme/icons/exe.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/folder-home.png b/pkgs/webapps/apache-theme/theme/icons/folder-home.png
index 14fe20a..14fe20a 100644
--- a/nixops/modules/websites/apache/theme/icons/folder-home.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder-home.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/folder-open.png b/pkgs/webapps/apache-theme/theme/icons/folder-open.png
index 2aa5cc7..2aa5cc7 100644
--- a/nixops/modules/websites/apache/theme/icons/folder-open.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder-open.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/folder-page.png b/pkgs/webapps/apache-theme/theme/icons/folder-page.png
index 604f9ad..604f9ad 100644
--- a/nixops/modules/websites/apache/theme/icons/folder-page.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder-page.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/folder-parent-old.png b/pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png
index b82d7a9..b82d7a9 100644
--- a/nixops/modules/websites/apache/theme/icons/folder-parent-old.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/folder-parent.png b/pkgs/webapps/apache-theme/theme/icons/folder-parent.png
index 3c964f1..3c964f1 100644
--- a/nixops/modules/websites/apache/theme/icons/folder-parent.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder-parent.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/folder.png b/pkgs/webapps/apache-theme/theme/icons/folder.png
index 7c613e0..7c613e0 100644
--- a/nixops/modules/websites/apache/theme/icons/folder.png
+++ b/pkgs/webapps/apache-theme/theme/icons/folder.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/gif.png b/pkgs/webapps/apache-theme/theme/icons/gif.png
index 01a2f2a..01a2f2a 100644
--- a/nixops/modules/websites/apache/theme/icons/gif.png
+++ b/pkgs/webapps/apache-theme/theme/icons/gif.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/gzip.png b/pkgs/webapps/apache-theme/theme/icons/gzip.png
index 99ae6fc..99ae6fc 100644
--- a/nixops/modules/websites/apache/theme/icons/gzip.png
+++ b/pkgs/webapps/apache-theme/theme/icons/gzip.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/h.png b/pkgs/webapps/apache-theme/theme/icons/h.png
index d3c7a9c..d3c7a9c 100644
--- a/nixops/modules/websites/apache/theme/icons/h.png
+++ b/pkgs/webapps/apache-theme/theme/icons/h.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/hpp.png b/pkgs/webapps/apache-theme/theme/icons/hpp.png
index e5e52e2..e5e52e2 100644
--- a/nixops/modules/websites/apache/theme/icons/hpp.png
+++ b/pkgs/webapps/apache-theme/theme/icons/hpp.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/html.png b/pkgs/webapps/apache-theme/theme/icons/html.png
index 2f94a78..2f94a78 100644
--- a/nixops/modules/websites/apache/theme/icons/html.png
+++ b/pkgs/webapps/apache-theme/theme/icons/html.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/ico.png b/pkgs/webapps/apache-theme/theme/icons/ico.png
index 82227e8..82227e8 100644
--- a/nixops/modules/websites/apache/theme/icons/ico.png
+++ b/pkgs/webapps/apache-theme/theme/icons/ico.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/image.png b/pkgs/webapps/apache-theme/theme/icons/image.png
index add1c59..add1c59 100644
--- a/nixops/modules/websites/apache/theme/icons/image.png
+++ b/pkgs/webapps/apache-theme/theme/icons/image.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/install.png b/pkgs/webapps/apache-theme/theme/icons/install.png
index 0a9c036..0a9c036 100644
--- a/nixops/modules/websites/apache/theme/icons/install.png
+++ b/pkgs/webapps/apache-theme/theme/icons/install.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/java.png b/pkgs/webapps/apache-theme/theme/icons/java.png
index 63b8683..63b8683 100644
--- a/nixops/modules/websites/apache/theme/icons/java.png
+++ b/pkgs/webapps/apache-theme/theme/icons/java.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/jpg.png b/pkgs/webapps/apache-theme/theme/icons/jpg.png
index a50c99b..a50c99b 100644
--- a/nixops/modules/websites/apache/theme/icons/jpg.png
+++ b/pkgs/webapps/apache-theme/theme/icons/jpg.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/js.png b/pkgs/webapps/apache-theme/theme/icons/js.png
index af1a475..af1a475 100644
--- a/nixops/modules/websites/apache/theme/icons/js.png
+++ b/pkgs/webapps/apache-theme/theme/icons/js.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/json.png b/pkgs/webapps/apache-theme/theme/icons/json.png
index af1a475..af1a475 100644
--- a/nixops/modules/websites/apache/theme/icons/json.png
+++ b/pkgs/webapps/apache-theme/theme/icons/json.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/log.png b/pkgs/webapps/apache-theme/theme/icons/log.png
index 02f1b9a..02f1b9a 100644
--- a/nixops/modules/websites/apache/theme/icons/log.png
+++ b/pkgs/webapps/apache-theme/theme/icons/log.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/makefile.png b/pkgs/webapps/apache-theme/theme/icons/makefile.png
index f99ea4c..f99ea4c 100644
--- a/nixops/modules/websites/apache/theme/icons/makefile.png
+++ b/pkgs/webapps/apache-theme/theme/icons/makefile.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/markdown.png b/pkgs/webapps/apache-theme/theme/icons/markdown.png
index 25c8373..25c8373 100644
--- a/nixops/modules/websites/apache/theme/icons/markdown.png
+++ b/pkgs/webapps/apache-theme/theme/icons/markdown.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/package.png b/pkgs/webapps/apache-theme/theme/icons/package.png
index fb1343e..fb1343e 100644
--- a/nixops/modules/websites/apache/theme/icons/package.png
+++ b/pkgs/webapps/apache-theme/theme/icons/package.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/pdf.png b/pkgs/webapps/apache-theme/theme/icons/pdf.png
index 7408d8d..7408d8d 100644
--- a/nixops/modules/websites/apache/theme/icons/pdf.png
+++ b/pkgs/webapps/apache-theme/theme/icons/pdf.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/php.png b/pkgs/webapps/apache-theme/theme/icons/php.png
index 22c4df6..22c4df6 100644
--- a/nixops/modules/websites/apache/theme/icons/php.png
+++ b/pkgs/webapps/apache-theme/theme/icons/php.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/playlist.png b/pkgs/webapps/apache-theme/theme/icons/playlist.png
index 8d6f281..8d6f281 100644
--- a/nixops/modules/websites/apache/theme/icons/playlist.png
+++ b/pkgs/webapps/apache-theme/theme/icons/playlist.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/png.png b/pkgs/webapps/apache-theme/theme/icons/png.png
index 1fe1ec4..1fe1ec4 100644
--- a/nixops/modules/websites/apache/theme/icons/png.png
+++ b/pkgs/webapps/apache-theme/theme/icons/png.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/pres.png b/pkgs/webapps/apache-theme/theme/icons/pres.png
index db195e9..db195e9 100644
--- a/nixops/modules/websites/apache/theme/icons/pres.png
+++ b/pkgs/webapps/apache-theme/theme/icons/pres.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/ps.png b/pkgs/webapps/apache-theme/theme/icons/ps.png
index 05f3ed9..05f3ed9 100644
--- a/nixops/modules/websites/apache/theme/icons/ps.png
+++ b/pkgs/webapps/apache-theme/theme/icons/ps.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/psd.png b/pkgs/webapps/apache-theme/theme/icons/psd.png
index 62718ee..62718ee 100644
--- a/nixops/modules/websites/apache/theme/icons/psd.png
+++ b/pkgs/webapps/apache-theme/theme/icons/psd.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/py.png b/pkgs/webapps/apache-theme/theme/icons/py.png
index 0aaffd1..0aaffd1 100644
--- a/nixops/modules/websites/apache/theme/icons/py.png
+++ b/pkgs/webapps/apache-theme/theme/icons/py.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/rar.png b/pkgs/webapps/apache-theme/theme/icons/rar.png
index 8a0ff54..8a0ff54 100644
--- a/nixops/modules/websites/apache/theme/icons/rar.png
+++ b/pkgs/webapps/apache-theme/theme/icons/rar.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/rb.png b/pkgs/webapps/apache-theme/theme/icons/rb.png
index c7db42f..c7db42f 100644
--- a/nixops/modules/websites/apache/theme/icons/rb.png
+++ b/pkgs/webapps/apache-theme/theme/icons/rb.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/readme.png b/pkgs/webapps/apache-theme/theme/icons/readme.png
index 3ae48cd..3ae48cd 100644
--- a/nixops/modules/websites/apache/theme/icons/readme.png
+++ b/pkgs/webapps/apache-theme/theme/icons/readme.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/rpm.png b/pkgs/webapps/apache-theme/theme/icons/rpm.png
index 64699ac..64699ac 100644
--- a/nixops/modules/websites/apache/theme/icons/rpm.png
+++ b/pkgs/webapps/apache-theme/theme/icons/rpm.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/rss.png b/pkgs/webapps/apache-theme/theme/icons/rss.png
index a1130a1..a1130a1 100644
--- a/nixops/modules/websites/apache/theme/icons/rss.png
+++ b/pkgs/webapps/apache-theme/theme/icons/rss.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/rtf.png b/pkgs/webapps/apache-theme/theme/icons/rtf.png
index 25c8373..25c8373 100644
--- a/nixops/modules/websites/apache/theme/icons/rtf.png
+++ b/pkgs/webapps/apache-theme/theme/icons/rtf.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/script.png b/pkgs/webapps/apache-theme/theme/icons/script.png
index 1099b5f..1099b5f 100644
--- a/nixops/modules/websites/apache/theme/icons/script.png
+++ b/pkgs/webapps/apache-theme/theme/icons/script.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/source.png b/pkgs/webapps/apache-theme/theme/icons/source.png
index 5bef920..5bef920 100644
--- a/nixops/modules/websites/apache/theme/icons/source.png
+++ b/pkgs/webapps/apache-theme/theme/icons/source.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/sql.png b/pkgs/webapps/apache-theme/theme/icons/sql.png
index b3b1467..b3b1467 100644
--- a/nixops/modules/websites/apache/theme/icons/sql.png
+++ b/pkgs/webapps/apache-theme/theme/icons/sql.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/tar.png b/pkgs/webapps/apache-theme/theme/icons/tar.png
index bab3b6a..bab3b6a 100644
--- a/nixops/modules/websites/apache/theme/icons/tar.png
+++ b/pkgs/webapps/apache-theme/theme/icons/tar.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/tex.png b/pkgs/webapps/apache-theme/theme/icons/tex.png
index 1487b25..1487b25 100644
--- a/nixops/modules/websites/apache/theme/icons/tex.png
+++ b/pkgs/webapps/apache-theme/theme/icons/tex.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/text.png b/pkgs/webapps/apache-theme/theme/icons/text.png
index 1d48677..1d48677 100644
--- a/nixops/modules/websites/apache/theme/icons/text.png
+++ b/pkgs/webapps/apache-theme/theme/icons/text.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/tiff.png b/pkgs/webapps/apache-theme/theme/icons/tiff.png
index 819e64c..819e64c 100644
--- a/nixops/modules/websites/apache/theme/icons/tiff.png
+++ b/pkgs/webapps/apache-theme/theme/icons/tiff.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/unknown.png b/pkgs/webapps/apache-theme/theme/icons/unknown.png
index b1dcc3f..b1dcc3f 100644
--- a/nixops/modules/websites/apache/theme/icons/unknown.png
+++ b/pkgs/webapps/apache-theme/theme/icons/unknown.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/vcal.png b/pkgs/webapps/apache-theme/theme/icons/vcal.png
index 3d81455..3d81455 100644
--- a/nixops/modules/websites/apache/theme/icons/vcal.png
+++ b/pkgs/webapps/apache-theme/theme/icons/vcal.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/video.png b/pkgs/webapps/apache-theme/theme/icons/video.png
index f92f7e1..f92f7e1 100644
--- a/nixops/modules/websites/apache/theme/icons/video.png
+++ b/pkgs/webapps/apache-theme/theme/icons/video.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/xml.png b/pkgs/webapps/apache-theme/theme/icons/xml.png
index 83a83df..83a83df 100644
--- a/nixops/modules/websites/apache/theme/icons/xml.png
+++ b/pkgs/webapps/apache-theme/theme/icons/xml.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/icons/zip.png b/pkgs/webapps/apache-theme/theme/icons/zip.png
index cc196c1..cc196c1 100644
--- a/nixops/modules/websites/apache/theme/icons/zip.png
+++ b/pkgs/webapps/apache-theme/theme/icons/zip.png
Binary files differ
diff --git a/nixops/modules/websites/apache/theme/style.css b/pkgs/webapps/apache-theme/theme/style.css
index 4d25c9f..4d25c9f 100644
--- a/nixops/modules/websites/apache/theme/style.css
+++ b/pkgs/webapps/apache-theme/theme/style.css
diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 229609f..8151b8d 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,6 +1,7 @@
1{ callPackage, mylibs, composerEnv, lib }: 1{ callPackage, mylibs, composerEnv, lib }:
2rec { 2rec {
3 adminer = callPackage ./adminer {}; 3 adminer = callPackage ./adminer {};
4 apache-theme = callPackage ./apache-theme {};
4 awl = callPackage ./awl {}; 5 awl = callPackage ./awl {};
5 davical = callPackage ./davical {}; 6 davical = callPackage ./davical {};
6 diaspora = callPackage ./diaspora { inherit mylibs; }; 7 diaspora = callPackage ./diaspora { inherit mylibs; };