From d7d031b69f7dfa958d38e96e5ace4b2db023dade Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 12 May 2019 15:27:47 +0200 Subject: [PATCH] Move Apache theme to pkgs --- nixops/modules/websites/default.nix | 85 +---------------- pkgs/webapps/apache-theme/default.nix | 86 ++++++++++++++++++ .../webapps/apache-theme}/theme/.htaccess | 0 .../webapps/apache-theme}/theme/footer.html | 0 .../webapps/apache-theme}/theme/header.html | 0 .../apache-theme}/theme/icons/archive.png | Bin .../apache-theme}/theme/icons/audio.png | Bin .../apache-theme}/theme/icons/authors.png | Bin .../webapps/apache-theme}/theme/icons/bin.png | Bin .../apache-theme}/theme/icons/blank.png | Bin .../webapps/apache-theme}/theme/icons/bmp.png | Bin .../webapps/apache-theme}/theme/icons/c.png | Bin .../apache-theme}/theme/icons/calc.png | Bin .../webapps/apache-theme}/theme/icons/cd.png | Bin .../apache-theme}/theme/icons/copying.png | Bin .../webapps/apache-theme}/theme/icons/cpp.png | Bin .../webapps/apache-theme}/theme/icons/css.png | Bin .../webapps/apache-theme}/theme/icons/deb.png | Bin .../apache-theme}/theme/icons/default.png | Bin .../apache-theme}/theme/icons/diff.png | Bin .../webapps/apache-theme}/theme/icons/doc.png | Bin .../apache-theme}/theme/icons/draw.png | Bin .../webapps/apache-theme}/theme/icons/eps.png | Bin .../webapps/apache-theme}/theme/icons/exe.png | Bin .../apache-theme}/theme/icons/folder-home.png | Bin .../apache-theme}/theme/icons/folder-open.png | Bin .../apache-theme}/theme/icons/folder-page.png | Bin .../theme/icons/folder-parent-old.png | Bin .../theme/icons/folder-parent.png | Bin .../apache-theme}/theme/icons/folder.png | Bin .../webapps/apache-theme}/theme/icons/gif.png | Bin .../apache-theme}/theme/icons/gzip.png | Bin .../webapps/apache-theme}/theme/icons/h.png | Bin .../webapps/apache-theme}/theme/icons/hpp.png | Bin .../apache-theme}/theme/icons/html.png | Bin .../webapps/apache-theme}/theme/icons/ico.png | Bin .../apache-theme}/theme/icons/image.png | Bin .../apache-theme}/theme/icons/install.png | Bin .../apache-theme}/theme/icons/java.png | Bin .../webapps/apache-theme}/theme/icons/jpg.png | Bin .../webapps/apache-theme}/theme/icons/js.png | Bin .../apache-theme}/theme/icons/json.png | Bin .../webapps/apache-theme}/theme/icons/log.png | Bin .../apache-theme}/theme/icons/makefile.png | Bin .../apache-theme}/theme/icons/markdown.png | Bin .../apache-theme}/theme/icons/package.png | Bin .../webapps/apache-theme}/theme/icons/pdf.png | Bin .../webapps/apache-theme}/theme/icons/php.png | Bin .../apache-theme}/theme/icons/playlist.png | Bin .../webapps/apache-theme}/theme/icons/png.png | Bin .../apache-theme}/theme/icons/pres.png | Bin .../webapps/apache-theme}/theme/icons/ps.png | Bin .../webapps/apache-theme}/theme/icons/psd.png | Bin .../webapps/apache-theme}/theme/icons/py.png | Bin .../webapps/apache-theme}/theme/icons/rar.png | Bin .../webapps/apache-theme}/theme/icons/rb.png | Bin .../apache-theme}/theme/icons/readme.png | Bin .../webapps/apache-theme}/theme/icons/rpm.png | Bin .../webapps/apache-theme}/theme/icons/rss.png | Bin .../webapps/apache-theme}/theme/icons/rtf.png | Bin .../apache-theme}/theme/icons/script.png | Bin .../apache-theme}/theme/icons/source.png | Bin .../webapps/apache-theme}/theme/icons/sql.png | Bin .../webapps/apache-theme}/theme/icons/tar.png | Bin .../webapps/apache-theme}/theme/icons/tex.png | Bin .../apache-theme}/theme/icons/text.png | Bin .../apache-theme}/theme/icons/tiff.png | Bin .../apache-theme}/theme/icons/unknown.png | Bin .../apache-theme}/theme/icons/vcal.png | Bin .../apache-theme}/theme/icons/video.png | Bin .../webapps/apache-theme}/theme/icons/xml.png | Bin .../webapps/apache-theme}/theme/icons/zip.png | Bin .../webapps/apache-theme}/theme/style.css | 0 pkgs/webapps/default.nix | 1 + 74 files changed, 89 insertions(+), 83 deletions(-) create mode 100644 pkgs/webapps/apache-theme/default.nix rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/.htaccess (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/footer.html (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/header.html (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/archive.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/audio.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/authors.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/bin.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/blank.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/bmp.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/c.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/calc.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/cd.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/copying.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/cpp.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/css.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/deb.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/default.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/diff.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/doc.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/draw.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/eps.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/exe.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/folder-home.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/folder-open.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/folder-page.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/folder-parent-old.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/folder-parent.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/folder.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/gif.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/gzip.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/h.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/hpp.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/html.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/ico.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/image.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/install.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/java.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/jpg.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/js.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/json.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/log.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/makefile.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/markdown.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/package.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/pdf.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/php.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/playlist.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/png.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/pres.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/ps.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/psd.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/py.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/rar.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/rb.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/readme.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/rpm.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/rss.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/rtf.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/script.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/source.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/sql.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/tar.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/tex.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/text.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/tiff.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/unknown.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/vcal.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/video.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/xml.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/icons/zip.png (100%) rename {nixops/modules/websites/apache => pkgs/webapps/apache-theme}/theme/style.css (100%) 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 ''; }; apaxy = { - extraConfig = '' - - Alias /theme ${theme_root} - - Options -Indexes - AllowOverride None - Require all granted - - - # mod_autoindex - - Options Indexes - AllowOverride None - Require all granted - - # Inspired from Apaxy by @adamwhitcroft - - IndexOptions +Charset=UTF-8 +FancyIndexing +IgnoreCase +FoldersFirst +XHTML +HTMLTable +SuppressRules +SuppressDescription +NameWidth=* +IconsAreLinks +ShowForbidden - - IndexHeadInsert "" - - IndexIgnoreReset ON - IndexIgnore /theme .htaccess %{ignored} - - AddIcon /theme/icons/blank.png ^^BLANKICON^^ - AddIcon /theme/icons/folder.png ^^DIRECTORY^^ - AddIcon /theme/icons/folder-home.png .. - - AddIconByType (TXT,/theme/icons/text.png) text/* - AddIconByType (IMG,/theme/icons/image.png) image/* - AddIconByType (SND,/theme/icons/audio.png) audio/* - AddIconByType (VID,/theme/icons/video.png) video/* - - AddIcon /theme/icons/archive.png .7z .bz2 .cab .gz .tar - 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 - AddIcon /theme/icons/bin.png .bin .hex - AddIcon /theme/icons/bmp.png .bmp - AddIcon /theme/icons/c.png .c - AddIcon /theme/icons/calc.png .xlsx .xlsm .xltx .xltm .xlam .xlr .xls .csv - AddIcon /theme/icons/cd.png .iso - AddIcon /theme/icons/cpp.png .cpp - AddIcon /theme/icons/css.png .css .sass .scss - AddIcon /theme/icons/deb.png .deb - AddIcon /theme/icons/doc.png .doc .docx .docm .dot .dotx .dotm .log .msg .odt .pages .rtf .tex .wpd .wps - AddIcon /theme/icons/draw.png .svg .svgz - AddIcon /theme/icons/eps.png .ai .eps - AddIcon /theme/icons/exe.png .exe - AddIcon /theme/icons/gif.png .gif - AddIcon /theme/icons/h.png .h - AddIcon /theme/icons/html.png .html .xhtml .shtml .htm .URL .url - AddIcon /theme/icons/ico.png .ico - AddIcon /theme/icons/java.png .jar - AddIcon /theme/icons/jpg.png .jpg .jpeg .jpe - AddIcon /theme/icons/js.png .js .json - AddIcon /theme/icons/markdown.png .md - AddIcon /theme/icons/package.png .pkg .dmg - AddIcon /theme/icons/pdf.png .pdf - AddIcon /theme/icons/php.png .php .phtml - AddIcon /theme/icons/playlist.png .m3u .m3u8 .pls .pls8 - AddIcon /theme/icons/png.png .png - AddIcon /theme/icons/ps.png .ps - AddIcon /theme/icons/psd.png .psd - AddIcon /theme/icons/py.png .py - AddIcon /theme/icons/rar.png .rar - AddIcon /theme/icons/rb.png .rb - AddIcon /theme/icons/rpm.png .rpm - AddIcon /theme/icons/rss.png .rss - AddIcon /theme/icons/script.png .bat .cmd .sh - AddIcon /theme/icons/sql.png .sql - AddIcon /theme/icons/tiff.png .tiff .tif - AddIcon /theme/icons/text.png .txt .nfo - AddIcon /theme/icons/video.png .asf .asx .avi .flv .mkv .mov .mp4 .mpg .rm .srt .swf .vob .wmv .m4v .f4v .f4p .ogv - AddIcon /theme/icons/xml.png .xml - AddIcon /theme/icons/zip.png .zip - DefaultIcon /theme/icons/default.png - - HeaderName /theme/header.html - ReadmeName /theme/footer.html - IndexStyleSheet /theme/style.css - - - ''; + extraConfig = (pkgs.webapps.apache-theme.override { inherit theme_root; }).apacheConfig; }; http2 = { modules = [ "http2" ]; @@ -418,7 +337,7 @@ in in '' mkdir -p $out/webapps ln -s ${../../www} $out/webapps/_www - ln -s ${./apache/theme} $out/webapps/_theme + ln -s ${pkgs.webapps.apache-theme.theme} $out/webapps/_theme ln -s ${adminer.webRoot} $out/webapps/${adminer.apache.webappName} ''; 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 @@ +{ theme_root ? null }: +rec { + theme = ./theme; + apacheConfig = '' + + Alias /theme ${if isNull theme_root then theme else theme_root} + + Options -Indexes + AllowOverride None + Require all granted + + + # mod_autoindex + + Options Indexes + AllowOverride None + Require all granted + + # Inspired from Apaxy by @adamwhitcroft + + IndexOptions +Charset=UTF-8 +FancyIndexing +IgnoreCase +FoldersFirst +XHTML +HTMLTable +SuppressRules +SuppressDescription +NameWidth=* +IconsAreLinks +ShowForbidden + + IndexHeadInsert "" + + IndexIgnoreReset ON + IndexIgnore /theme .htaccess %{ignored} + + AddIcon /theme/icons/blank.png ^^BLANKICON^^ + AddIcon /theme/icons/folder.png ^^DIRECTORY^^ + AddIcon /theme/icons/folder-home.png .. + + AddIconByType (TXT,/theme/icons/text.png) text/* + AddIconByType (IMG,/theme/icons/image.png) image/* + AddIconByType (SND,/theme/icons/audio.png) audio/* + AddIconByType (VID,/theme/icons/video.png) video/* + + AddIcon /theme/icons/archive.png .7z .bz2 .cab .gz .tar + 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 + AddIcon /theme/icons/bin.png .bin .hex + AddIcon /theme/icons/bmp.png .bmp + AddIcon /theme/icons/c.png .c + AddIcon /theme/icons/calc.png .xlsx .xlsm .xltx .xltm .xlam .xlr .xls .csv + AddIcon /theme/icons/cd.png .iso + AddIcon /theme/icons/cpp.png .cpp + AddIcon /theme/icons/css.png .css .sass .scss + AddIcon /theme/icons/deb.png .deb + AddIcon /theme/icons/doc.png .doc .docx .docm .dot .dotx .dotm .log .msg .odt .pages .rtf .tex .wpd .wps + AddIcon /theme/icons/draw.png .svg .svgz + AddIcon /theme/icons/eps.png .ai .eps + AddIcon /theme/icons/exe.png .exe + AddIcon /theme/icons/gif.png .gif + AddIcon /theme/icons/h.png .h + AddIcon /theme/icons/html.png .html .xhtml .shtml .htm .URL .url + AddIcon /theme/icons/ico.png .ico + AddIcon /theme/icons/java.png .jar + AddIcon /theme/icons/jpg.png .jpg .jpeg .jpe + AddIcon /theme/icons/js.png .js .json + AddIcon /theme/icons/markdown.png .md + AddIcon /theme/icons/package.png .pkg .dmg + AddIcon /theme/icons/pdf.png .pdf + AddIcon /theme/icons/php.png .php .phtml + AddIcon /theme/icons/playlist.png .m3u .m3u8 .pls .pls8 + AddIcon /theme/icons/png.png .png + AddIcon /theme/icons/ps.png .ps + AddIcon /theme/icons/psd.png .psd + AddIcon /theme/icons/py.png .py + AddIcon /theme/icons/rar.png .rar + AddIcon /theme/icons/rb.png .rb + AddIcon /theme/icons/rpm.png .rpm + AddIcon /theme/icons/rss.png .rss + AddIcon /theme/icons/script.png .bat .cmd .sh + AddIcon /theme/icons/sql.png .sql + AddIcon /theme/icons/tiff.png .tiff .tif + AddIcon /theme/icons/text.png .txt .nfo + AddIcon /theme/icons/video.png .asf .asx .avi .flv .mkv .mov .mp4 .mpg .rm .srt .swf .vob .wmv .m4v .f4v .f4p .ogv + AddIcon /theme/icons/xml.png .xml + AddIcon /theme/icons/zip.png .zip + DefaultIcon /theme/icons/default.png + + HeaderName /theme/header.html + ReadmeName /theme/footer.html + IndexStyleSheet /theme/style.css + + + ''; +} diff --git a/nixops/modules/websites/apache/theme/.htaccess b/pkgs/webapps/apache-theme/theme/.htaccess similarity index 100% rename from nixops/modules/websites/apache/theme/.htaccess rename to pkgs/webapps/apache-theme/theme/.htaccess diff --git a/nixops/modules/websites/apache/theme/footer.html b/pkgs/webapps/apache-theme/theme/footer.html similarity index 100% rename from nixops/modules/websites/apache/theme/footer.html rename to 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 similarity index 100% rename from nixops/modules/websites/apache/theme/header.html rename to 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 similarity index 100% rename from nixops/modules/websites/apache/theme/icons/archive.png rename to pkgs/webapps/apache-theme/theme/icons/archive.png diff --git a/nixops/modules/websites/apache/theme/icons/audio.png b/pkgs/webapps/apache-theme/theme/icons/audio.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/audio.png rename to pkgs/webapps/apache-theme/theme/icons/audio.png diff --git a/nixops/modules/websites/apache/theme/icons/authors.png b/pkgs/webapps/apache-theme/theme/icons/authors.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/authors.png rename to pkgs/webapps/apache-theme/theme/icons/authors.png diff --git a/nixops/modules/websites/apache/theme/icons/bin.png b/pkgs/webapps/apache-theme/theme/icons/bin.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/bin.png rename to pkgs/webapps/apache-theme/theme/icons/bin.png diff --git a/nixops/modules/websites/apache/theme/icons/blank.png b/pkgs/webapps/apache-theme/theme/icons/blank.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/blank.png rename to pkgs/webapps/apache-theme/theme/icons/blank.png diff --git a/nixops/modules/websites/apache/theme/icons/bmp.png b/pkgs/webapps/apache-theme/theme/icons/bmp.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/bmp.png rename to pkgs/webapps/apache-theme/theme/icons/bmp.png diff --git a/nixops/modules/websites/apache/theme/icons/c.png b/pkgs/webapps/apache-theme/theme/icons/c.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/c.png rename to pkgs/webapps/apache-theme/theme/icons/c.png diff --git a/nixops/modules/websites/apache/theme/icons/calc.png b/pkgs/webapps/apache-theme/theme/icons/calc.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/calc.png rename to pkgs/webapps/apache-theme/theme/icons/calc.png diff --git a/nixops/modules/websites/apache/theme/icons/cd.png b/pkgs/webapps/apache-theme/theme/icons/cd.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/cd.png rename to pkgs/webapps/apache-theme/theme/icons/cd.png diff --git a/nixops/modules/websites/apache/theme/icons/copying.png b/pkgs/webapps/apache-theme/theme/icons/copying.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/copying.png rename to pkgs/webapps/apache-theme/theme/icons/copying.png diff --git a/nixops/modules/websites/apache/theme/icons/cpp.png b/pkgs/webapps/apache-theme/theme/icons/cpp.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/cpp.png rename to pkgs/webapps/apache-theme/theme/icons/cpp.png diff --git a/nixops/modules/websites/apache/theme/icons/css.png b/pkgs/webapps/apache-theme/theme/icons/css.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/css.png rename to pkgs/webapps/apache-theme/theme/icons/css.png diff --git a/nixops/modules/websites/apache/theme/icons/deb.png b/pkgs/webapps/apache-theme/theme/icons/deb.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/deb.png rename to pkgs/webapps/apache-theme/theme/icons/deb.png diff --git a/nixops/modules/websites/apache/theme/icons/default.png b/pkgs/webapps/apache-theme/theme/icons/default.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/default.png rename to pkgs/webapps/apache-theme/theme/icons/default.png diff --git a/nixops/modules/websites/apache/theme/icons/diff.png b/pkgs/webapps/apache-theme/theme/icons/diff.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/diff.png rename to pkgs/webapps/apache-theme/theme/icons/diff.png diff --git a/nixops/modules/websites/apache/theme/icons/doc.png b/pkgs/webapps/apache-theme/theme/icons/doc.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/doc.png rename to pkgs/webapps/apache-theme/theme/icons/doc.png diff --git a/nixops/modules/websites/apache/theme/icons/draw.png b/pkgs/webapps/apache-theme/theme/icons/draw.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/draw.png rename to pkgs/webapps/apache-theme/theme/icons/draw.png diff --git a/nixops/modules/websites/apache/theme/icons/eps.png b/pkgs/webapps/apache-theme/theme/icons/eps.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/eps.png rename to pkgs/webapps/apache-theme/theme/icons/eps.png diff --git a/nixops/modules/websites/apache/theme/icons/exe.png b/pkgs/webapps/apache-theme/theme/icons/exe.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/exe.png rename to pkgs/webapps/apache-theme/theme/icons/exe.png diff --git a/nixops/modules/websites/apache/theme/icons/folder-home.png b/pkgs/webapps/apache-theme/theme/icons/folder-home.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/folder-home.png rename to pkgs/webapps/apache-theme/theme/icons/folder-home.png diff --git a/nixops/modules/websites/apache/theme/icons/folder-open.png b/pkgs/webapps/apache-theme/theme/icons/folder-open.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/folder-open.png rename to pkgs/webapps/apache-theme/theme/icons/folder-open.png diff --git a/nixops/modules/websites/apache/theme/icons/folder-page.png b/pkgs/webapps/apache-theme/theme/icons/folder-page.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/folder-page.png rename to pkgs/webapps/apache-theme/theme/icons/folder-page.png diff --git a/nixops/modules/websites/apache/theme/icons/folder-parent-old.png b/pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/folder-parent-old.png rename to pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png diff --git a/nixops/modules/websites/apache/theme/icons/folder-parent.png b/pkgs/webapps/apache-theme/theme/icons/folder-parent.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/folder-parent.png rename to pkgs/webapps/apache-theme/theme/icons/folder-parent.png diff --git a/nixops/modules/websites/apache/theme/icons/folder.png b/pkgs/webapps/apache-theme/theme/icons/folder.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/folder.png rename to pkgs/webapps/apache-theme/theme/icons/folder.png diff --git a/nixops/modules/websites/apache/theme/icons/gif.png b/pkgs/webapps/apache-theme/theme/icons/gif.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/gif.png rename to pkgs/webapps/apache-theme/theme/icons/gif.png diff --git a/nixops/modules/websites/apache/theme/icons/gzip.png b/pkgs/webapps/apache-theme/theme/icons/gzip.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/gzip.png rename to pkgs/webapps/apache-theme/theme/icons/gzip.png diff --git a/nixops/modules/websites/apache/theme/icons/h.png b/pkgs/webapps/apache-theme/theme/icons/h.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/h.png rename to pkgs/webapps/apache-theme/theme/icons/h.png diff --git a/nixops/modules/websites/apache/theme/icons/hpp.png b/pkgs/webapps/apache-theme/theme/icons/hpp.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/hpp.png rename to pkgs/webapps/apache-theme/theme/icons/hpp.png diff --git a/nixops/modules/websites/apache/theme/icons/html.png b/pkgs/webapps/apache-theme/theme/icons/html.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/html.png rename to pkgs/webapps/apache-theme/theme/icons/html.png diff --git a/nixops/modules/websites/apache/theme/icons/ico.png b/pkgs/webapps/apache-theme/theme/icons/ico.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/ico.png rename to pkgs/webapps/apache-theme/theme/icons/ico.png diff --git a/nixops/modules/websites/apache/theme/icons/image.png b/pkgs/webapps/apache-theme/theme/icons/image.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/image.png rename to pkgs/webapps/apache-theme/theme/icons/image.png diff --git a/nixops/modules/websites/apache/theme/icons/install.png b/pkgs/webapps/apache-theme/theme/icons/install.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/install.png rename to pkgs/webapps/apache-theme/theme/icons/install.png diff --git a/nixops/modules/websites/apache/theme/icons/java.png b/pkgs/webapps/apache-theme/theme/icons/java.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/java.png rename to pkgs/webapps/apache-theme/theme/icons/java.png diff --git a/nixops/modules/websites/apache/theme/icons/jpg.png b/pkgs/webapps/apache-theme/theme/icons/jpg.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/jpg.png rename to pkgs/webapps/apache-theme/theme/icons/jpg.png diff --git a/nixops/modules/websites/apache/theme/icons/js.png b/pkgs/webapps/apache-theme/theme/icons/js.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/js.png rename to pkgs/webapps/apache-theme/theme/icons/js.png diff --git a/nixops/modules/websites/apache/theme/icons/json.png b/pkgs/webapps/apache-theme/theme/icons/json.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/json.png rename to pkgs/webapps/apache-theme/theme/icons/json.png diff --git a/nixops/modules/websites/apache/theme/icons/log.png b/pkgs/webapps/apache-theme/theme/icons/log.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/log.png rename to pkgs/webapps/apache-theme/theme/icons/log.png diff --git a/nixops/modules/websites/apache/theme/icons/makefile.png b/pkgs/webapps/apache-theme/theme/icons/makefile.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/makefile.png rename to pkgs/webapps/apache-theme/theme/icons/makefile.png diff --git a/nixops/modules/websites/apache/theme/icons/markdown.png b/pkgs/webapps/apache-theme/theme/icons/markdown.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/markdown.png rename to pkgs/webapps/apache-theme/theme/icons/markdown.png diff --git a/nixops/modules/websites/apache/theme/icons/package.png b/pkgs/webapps/apache-theme/theme/icons/package.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/package.png rename to pkgs/webapps/apache-theme/theme/icons/package.png diff --git a/nixops/modules/websites/apache/theme/icons/pdf.png b/pkgs/webapps/apache-theme/theme/icons/pdf.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/pdf.png rename to pkgs/webapps/apache-theme/theme/icons/pdf.png diff --git a/nixops/modules/websites/apache/theme/icons/php.png b/pkgs/webapps/apache-theme/theme/icons/php.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/php.png rename to pkgs/webapps/apache-theme/theme/icons/php.png diff --git a/nixops/modules/websites/apache/theme/icons/playlist.png b/pkgs/webapps/apache-theme/theme/icons/playlist.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/playlist.png rename to pkgs/webapps/apache-theme/theme/icons/playlist.png diff --git a/nixops/modules/websites/apache/theme/icons/png.png b/pkgs/webapps/apache-theme/theme/icons/png.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/png.png rename to pkgs/webapps/apache-theme/theme/icons/png.png diff --git a/nixops/modules/websites/apache/theme/icons/pres.png b/pkgs/webapps/apache-theme/theme/icons/pres.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/pres.png rename to pkgs/webapps/apache-theme/theme/icons/pres.png diff --git a/nixops/modules/websites/apache/theme/icons/ps.png b/pkgs/webapps/apache-theme/theme/icons/ps.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/ps.png rename to pkgs/webapps/apache-theme/theme/icons/ps.png diff --git a/nixops/modules/websites/apache/theme/icons/psd.png b/pkgs/webapps/apache-theme/theme/icons/psd.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/psd.png rename to pkgs/webapps/apache-theme/theme/icons/psd.png diff --git a/nixops/modules/websites/apache/theme/icons/py.png b/pkgs/webapps/apache-theme/theme/icons/py.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/py.png rename to pkgs/webapps/apache-theme/theme/icons/py.png diff --git a/nixops/modules/websites/apache/theme/icons/rar.png b/pkgs/webapps/apache-theme/theme/icons/rar.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/rar.png rename to pkgs/webapps/apache-theme/theme/icons/rar.png diff --git a/nixops/modules/websites/apache/theme/icons/rb.png b/pkgs/webapps/apache-theme/theme/icons/rb.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/rb.png rename to pkgs/webapps/apache-theme/theme/icons/rb.png diff --git a/nixops/modules/websites/apache/theme/icons/readme.png b/pkgs/webapps/apache-theme/theme/icons/readme.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/readme.png rename to pkgs/webapps/apache-theme/theme/icons/readme.png diff --git a/nixops/modules/websites/apache/theme/icons/rpm.png b/pkgs/webapps/apache-theme/theme/icons/rpm.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/rpm.png rename to pkgs/webapps/apache-theme/theme/icons/rpm.png diff --git a/nixops/modules/websites/apache/theme/icons/rss.png b/pkgs/webapps/apache-theme/theme/icons/rss.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/rss.png rename to pkgs/webapps/apache-theme/theme/icons/rss.png diff --git a/nixops/modules/websites/apache/theme/icons/rtf.png b/pkgs/webapps/apache-theme/theme/icons/rtf.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/rtf.png rename to pkgs/webapps/apache-theme/theme/icons/rtf.png diff --git a/nixops/modules/websites/apache/theme/icons/script.png b/pkgs/webapps/apache-theme/theme/icons/script.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/script.png rename to pkgs/webapps/apache-theme/theme/icons/script.png diff --git a/nixops/modules/websites/apache/theme/icons/source.png b/pkgs/webapps/apache-theme/theme/icons/source.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/source.png rename to pkgs/webapps/apache-theme/theme/icons/source.png diff --git a/nixops/modules/websites/apache/theme/icons/sql.png b/pkgs/webapps/apache-theme/theme/icons/sql.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/sql.png rename to pkgs/webapps/apache-theme/theme/icons/sql.png diff --git a/nixops/modules/websites/apache/theme/icons/tar.png b/pkgs/webapps/apache-theme/theme/icons/tar.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/tar.png rename to pkgs/webapps/apache-theme/theme/icons/tar.png diff --git a/nixops/modules/websites/apache/theme/icons/tex.png b/pkgs/webapps/apache-theme/theme/icons/tex.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/tex.png rename to pkgs/webapps/apache-theme/theme/icons/tex.png diff --git a/nixops/modules/websites/apache/theme/icons/text.png b/pkgs/webapps/apache-theme/theme/icons/text.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/text.png rename to pkgs/webapps/apache-theme/theme/icons/text.png diff --git a/nixops/modules/websites/apache/theme/icons/tiff.png b/pkgs/webapps/apache-theme/theme/icons/tiff.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/tiff.png rename to pkgs/webapps/apache-theme/theme/icons/tiff.png diff --git a/nixops/modules/websites/apache/theme/icons/unknown.png b/pkgs/webapps/apache-theme/theme/icons/unknown.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/unknown.png rename to pkgs/webapps/apache-theme/theme/icons/unknown.png diff --git a/nixops/modules/websites/apache/theme/icons/vcal.png b/pkgs/webapps/apache-theme/theme/icons/vcal.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/vcal.png rename to pkgs/webapps/apache-theme/theme/icons/vcal.png diff --git a/nixops/modules/websites/apache/theme/icons/video.png b/pkgs/webapps/apache-theme/theme/icons/video.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/video.png rename to pkgs/webapps/apache-theme/theme/icons/video.png diff --git a/nixops/modules/websites/apache/theme/icons/xml.png b/pkgs/webapps/apache-theme/theme/icons/xml.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/xml.png rename to pkgs/webapps/apache-theme/theme/icons/xml.png diff --git a/nixops/modules/websites/apache/theme/icons/zip.png b/pkgs/webapps/apache-theme/theme/icons/zip.png similarity index 100% rename from nixops/modules/websites/apache/theme/icons/zip.png rename to pkgs/webapps/apache-theme/theme/icons/zip.png diff --git a/nixops/modules/websites/apache/theme/style.css b/pkgs/webapps/apache-theme/theme/style.css similarity index 100% rename from nixops/modules/websites/apache/theme/style.css rename to 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 @@ { callPackage, mylibs, composerEnv, lib }: rec { adminer = callPackage ./adminer {}; + apache-theme = callPackage ./apache-theme {}; awl = callPackage ./awl {}; davical = callPackage ./davical {}; diaspora = callPackage ./diaspora { inherit mylibs; }; -- 2.41.0