From c1b6f97a72e0b4897ce11414df28259d4ea3c5ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 2 May 2019 02:17:28 +0200 Subject: Move some overlays to parent directory --- nixops/modules/buildbot/apprise.json | 15 - nixops/modules/buildbot/default.nix | 27 - nixops/modules/databases/mysql.nix | 8 - nixops/modules/databases/postgresql.nix | 12 - .../databases/postgresql_run_socket_path.patch | 12 - nixops/modules/irc/bitlbee_long_nicks.patch | 56 -- nixops/modules/irc/default.nix | 6 - nixops/modules/websites/commons/stats.nix | 7 - nixops/modules/websites/tools/git/default.nix | 8 - .../tools/git/gitweb/theme/git-favicon.png | Bin 1125 -> 0 bytes .../websites/tools/git/gitweb/theme/git-logo.png | Bin 2412 -> 0 bytes .../websites/tools/git/gitweb/theme/gitweb.css | 783 --------------------- .../websites/tools/git/gitweb/theme/gitweb.js | 27 - nixops/modules/websites/tools/tools/default.nix | 6 - .../websites/tools/tools/ympd-password-env.patch | 23 - nixops/modules/websites/tools/tools/ympd.json | 15 - 16 files changed, 1005 deletions(-) delete mode 100644 nixops/modules/buildbot/apprise.json delete mode 100644 nixops/modules/databases/postgresql_run_socket_path.patch delete mode 100644 nixops/modules/irc/bitlbee_long_nicks.patch delete mode 100644 nixops/modules/websites/tools/git/gitweb/theme/git-favicon.png delete mode 100644 nixops/modules/websites/tools/git/gitweb/theme/git-logo.png delete mode 100644 nixops/modules/websites/tools/git/gitweb/theme/gitweb.css delete mode 100644 nixops/modules/websites/tools/git/gitweb/theme/gitweb.js delete mode 100644 nixops/modules/websites/tools/tools/ympd-password-env.patch delete mode 100644 nixops/modules/websites/tools/tools/ympd.json (limited to 'nixops/modules') diff --git a/nixops/modules/buildbot/apprise.json b/nixops/modules/buildbot/apprise.json deleted file mode 100644 index b408ea4..0000000 --- a/nixops/modules/buildbot/apprise.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "c9b957c-master", - "meta": { - "name": "apprise", - "url": "https://github.com/caronc/apprise", - "branch": "master" - }, - "github": { - "owner": "caronc", - "repo": "apprise", - "rev": "c9b957c4341e7d43e5be6463bd317a7401d083d9", - "sha256": "01zz4mh3xvplrm5xalzrcncnh0jq5y51pmdxkr4hdd6dz9wx0mbg", - "fetchSubmodules": true - } -} diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix index 1c37e05..7632602 100644 --- a/nixops/modules/buildbot/default.nix +++ b/nixops/modules/buildbot/default.nix @@ -62,33 +62,6 @@ in }; config = lib.mkIf config.services.buildbot.enable { - nixpkgs.overlays = [ (self: super: rec { - python3 = super.python3.override { - packageOverrides = python-self: python-super: { - wokkel = python-self.buildPythonPackage rec { - pname = "wokkel"; - version = "18.0.0"; - src = python-self.fetchPypi { - inherit pname version; - sha256 = "1spq44gg8gsviqx1dvlmjpgfc0wk0jpyx4ap01y2pad1ai9cw016"; - }; - propagatedBuildInputs = with python-self; [ twisted.extras.tls twisted incremental dateutil ]; - doChecks = false; - }; - apprise = python-self.buildPythonPackage rec { - pname = "apprise"; - version = "0.7.4"; - src = (mylibs.fetchedGithub ./apprise.json).src; - propagatedBuildInputs = with python-self; [ decorator - requests requests_oauthlib oauthlib urllib3 six click - markdown pyyaml sleekxmpp - ]; - doChecks = false; - }; - }; - }; - }) ]; - ids.uids.buildbot = myconfig.env.buildbot.user.uid; ids.gids.buildbot = myconfig.env.buildbot.user.gid; diff --git a/nixops/modules/databases/mysql.nix b/nixops/modules/databases/mysql.nix index a9ca8d3..2d56155 100644 --- a/nixops/modules/databases/mysql.nix +++ b/nixops/modules/databases/mysql.nix @@ -14,14 +14,6 @@ in { }; config = lib.mkIf cfg.enable { - nixpkgs.overlays = [ (self: super: rec { - mariadb = mariadbPAM; - mariadbPAM = super.mariadb.overrideAttrs(old: rec { - cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; - buildInputs = old.buildInputs ++ [ self.pam ]; - }); - }) ]; - networking.firewall.allowedTCPPorts = [ 3306 ]; # for adminer, ssl is implemented with mysqli only, which is diff --git a/nixops/modules/databases/postgresql.nix b/nixops/modules/databases/postgresql.nix index 62e9e34..0afce70 100644 --- a/nixops/modules/databases/postgresql.nix +++ b/nixops/modules/databases/postgresql.nix @@ -14,18 +14,6 @@ in { }; config = lib.mkIf cfg.enable { - nixpkgs.overlays = [ (self: super: rec { - postgresql = postgresql_11; - postgresql_11 = super.postgresql_11.overrideAttrs(old: rec { - passthru = old.passthru // { psqlSchema = "11.0"; }; - configureFlags = old.configureFlags ++ [ "--with-pam" ]; - buildInputs = (old.buildInputs or []) ++ [ self.pam ]; - patches = old.patches ++ [ - ./postgresql_run_socket_path.patch - ]; - }); - }) ]; - networking.firewall.allowedTCPPorts = [ 5432 ]; security.acme.certs."postgresql" = config.services.myCertificates.certConfig // { diff --git a/nixops/modules/databases/postgresql_run_socket_path.patch b/nixops/modules/databases/postgresql_run_socket_path.patch deleted file mode 100644 index b558c7b..0000000 --- a/nixops/modules/databases/postgresql_run_socket_path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h ---- postgresql-9.2.0.sockets/src/include/pg_config_manual.h 2012-09-06 17:26:17.000000000 -0400 -+++ postgresql-9.2.0/src/include/pg_config_manual.h 2012-09-06 18:13:18.183092471 -0400 -@@ -144,7 +144,7 @@ - * here's where to twiddle it. You can also override this at runtime - * with the postmaster's -k switch. - */ --#define DEFAULT_PGSOCKET_DIR "/tmp" -+#define DEFAULT_PGSOCKET_DIR "/run/postgresql" - - /* - * The random() function is expected to yield values between 0 and diff --git a/nixops/modules/irc/bitlbee_long_nicks.patch b/nixops/modules/irc/bitlbee_long_nicks.patch deleted file mode 100644 index 70be092..0000000 --- a/nixops/modules/irc/bitlbee_long_nicks.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/bitlbee.h b/bitlbee.h -index 17ab2979..5858277e 100644 ---- a/bitlbee.h -+++ b/bitlbee.h -@@ -121,7 +121,7 @@ extern "C" { - #define CONTROL_TOPIC "Welcome to the control channel. Type \2help\2 for help information." - #define IRCD_INFO PACKAGE " " - --#define MAX_NICK_LENGTH 24 -+#define MAX_NICK_LENGTH 99 - - #define HELP_FILE VARDIR "help.txt" - #define CONF_FILE_DEF ETCDIR "bitlbee.conf" -diff --git a/tests/check_nick.c b/tests/check_nick.c -index ca5e5111..909fdcc9 100644 ---- a/tests/check_nick.c -+++ b/tests/check_nick.c -@@ -11,16 +11,16 @@ - START_TEST(test_nick_strip){ - int i; - const char *get[] = { "test:", "test", "test\n", -- "thisisaveryveryveryverylongnick", -- "thisisave:ryveryveryverylongnick", -+ "thisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnick", -+ "thisis:averyveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnick", - "t::::est", - "test123", - "123test", - "123", - NULL }; - const char *expected[] = { "test", "test", "test", -- "thisisaveryveryveryveryl", -- "thisisaveryveryveryveryl", -+ "thisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnickthisisaveryve", -+ "thisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnickthisisaveryve", - "test", - "test123", - "_123test", -@@ -28,7 +28,7 @@ START_TEST(test_nick_strip){ - NULL }; - - for (i = 0; get[i]; i++) { -- char copy[60]; -+ char copy[260]; - strcpy(copy, get[i]); - nick_strip(NULL, copy); - fail_unless(strcmp(copy, expected[i]) == 0, -@@ -53,7 +53,7 @@ END_TEST - - START_TEST(test_nick_ok_notok) - { -- const char *nicks[] = { "thisisaveryveryveryveryveryveryverylongnick", -+ const char *nicks[] = { "thisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnickthisisaveryveryveryveryveryveryverylongnick", - "\nillegalchar", "", "nick%", "123test", NULL }; - int i; - diff --git a/nixops/modules/irc/default.nix b/nixops/modules/irc/default.nix index 37cb53b..4cf27e5 100644 --- a/nixops/modules/irc/default.nix +++ b/nixops/modules/irc/default.nix @@ -69,12 +69,6 @@ in ''; }; - nixpkgs.overlays = [ (self: super: rec { - bitlbee = super.bitlbee.overrideAttrs(old: { - patches = (old.patches or []) ++ [ ./bitlbee_long_nicks.patch ]; - }); - }) ]; - networking.firewall.allowedTCPPorts = [ 6697 ]; services.bitlbee = { enable = true; diff --git a/nixops/modules/websites/commons/stats.nix b/nixops/modules/websites/commons/stats.nix index 8d618c5..c707303 100644 --- a/nixops/modules/websites/commons/stats.nix +++ b/nixops/modules/websites/commons/stats.nix @@ -23,13 +23,6 @@ in { pkgs.goaccess ]; - nixpkgs.overlays = [ (self: super: rec { - goaccess = super.goaccess.overrideAttrs(old: rec { - configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ]; - buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ]; - }); - }) ]; - services.cron = { enable = true; systemCronJobs = let diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix index 4a1457f..dc44049 100644 --- a/nixops/modules/websites/tools/git/default.nix +++ b/nixops/modules/websites/tools/git/default.nix @@ -15,14 +15,6 @@ in { config = lib.mkIf cfg.enable { security.acme.certs."eldiron".extraDomains."git.immae.eu" = null; - nixpkgs.overlays = [ (self: super: rec { - gitweb = super.gitweb.overrideAttrs(old: { - installPhase = old.installPhase + '' - cp -r ${./gitweb/theme} $out/gitweb-theme; - ''; - }); - }) ]; - mySecrets.keys = mantisbt.keys; services.myWebsites.tools.modules = gitweb.apache.modules ++ diff --git a/nixops/modules/websites/tools/git/gitweb/theme/git-favicon.png b/nixops/modules/websites/tools/git/gitweb/theme/git-favicon.png deleted file mode 100644 index 4fa44bb..0000000 Binary files a/nixops/modules/websites/tools/git/gitweb/theme/git-favicon.png and /dev/null differ diff --git a/nixops/modules/websites/tools/git/gitweb/theme/git-logo.png b/nixops/modules/websites/tools/git/gitweb/theme/git-logo.png deleted file mode 100644 index fdaf7b7..0000000 Binary files a/nixops/modules/websites/tools/git/gitweb/theme/git-logo.png and /dev/null differ diff --git a/nixops/modules/websites/tools/git/gitweb/theme/gitweb.css b/nixops/modules/websites/tools/git/gitweb/theme/gitweb.css deleted file mode 100644 index 83e0742..0000000 --- a/nixops/modules/websites/tools/git/gitweb/theme/gitweb.css +++ /dev/null @@ -1,783 +0,0 @@ -/* Reset -------------------------------------------------------------------------- */ - -/* Based on http://meyerweb.com/eric/tools/css/reset/ */ -/* v1.0 | 20080212 */ - -html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, -blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, -font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, -u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, -caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; - background: transparent; -} - -ol, ul { list-style: none; } - -blockquote, q { quotes: none; } - -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} - -:focus { outline: 0; } - -ins { text-decoration: none; } - -del { text-decoration: line-through; } - -table { - border-collapse: collapse; - border-spacing: 0; -} - -a { outline: none; } - -/* General ----------------------------------------------------------------------------- */ - -html { - position: relative; - min-height: 100%; -} - -body { - font: 13px Helvetica,arial,freesans,clean,sans-serif; - line-height: 1.4; - margin: 0 0 105px; - background-color: #fff; - color: #000000; -} - -/* Monospaced Fonts */ -.sha1, .mode, .diff_tree .list, .pre, .diff, .patchset { - font-family: 'Consolas','Bitstream Vera Sans Mono',monospace; -} - -a:link, a:visited { - color: #4183C4; - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} - -td.list a[href*='tree'], td.list a[href*='blob'] { - padding-left: 20px; - display: block; - float: left; - height: 16px; - line-height: 16px; -} - -td.list a[href*='tree'] { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABq0lEQVQ4y8WTu4oUQRSGv+rtGVuxhwVFdFEEE2c3d0HYTEMTn8DEVxADQTDUF9DMwMxQMBMx8AEWzRQ3cBHd9TI91+2urjq/QbczY2IygSep4nD+79yqnCRWsYQVbWVACvDh5ZXdrLe15dwyT1TjT/sxFFeB6i+VA2B6+cb7kAI4Jf0LO087zjlQI8Y5Qvnj0sHug321XoC1bk+K9eHk6+s7wPMUgKAS88eqb4+Jfg2SHs7lZBvX2Nh+2EUCDGSAcMnJsx9f7NxfAGqXyDzRd5EJO/pMPT1gcviGTnYOVIN5pAAE8v7dLrKL8xnglFk4ws9Afko9HpH3b5Gd2mwb/lOBmgrSdYhJugDUCenxM6xv3p4HCsP8F0LxCsUhCkMURihOyM7fg0osASTFEpu9a4LjGIUCqwcoDiEUrX+E4hRUQb20RiokC1j9vckUhygU7X3QZh7NAVKYL7YBeMkRUfjVCotF2XGIwnghtrJpMywB5G0QZj9P1JNujuWJ1AHLQadRrACPkuZ0SSSWpeStWgDK6tHek5vbiOs48n++XQHurcf0rFng//6NvwG+iB9/4duaTgAAAABJRU5ErkJgggo=) center left no-repeat; -} - -td.list a[href*='blob'] { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAA6ElEQVQoFQXBMW5TQRgGwNnHnoE0QbiCjoIooUmTU3AuS1BwIoTSUdJBigg3GCWOg9/++zHTop078wIAsPMrE4SL5/1aIyMjIyMjz/m0tbFECFdrPeaQQw75mz/5nZH7fN7aWILmauSYfznmmIfss8vIUx7zZWsTTXM5vpWvTk5Wq9VHQP/gtgOLa0Qpw940vAQdaG6thpOhlOkG0AEuAVGmEkAH+G4YSikxXQM6wDsAMRFAB/ihDNNUmN4DOsAbBAEAdICfpmmaAt4COoj2GgCASbIkZh1NAACznhQt2itnFgAAlF3u/gMDtJXPzQxoswAAAABJRU5ErkJgggo=) center left no-repeat; -} - -i { - font-style: normal; -} - -td, th { - padding: 5px; -} - -.page_nav br { - display: none; -} - -/* Page Header ----------------------------------------------------------------------------- */ - -.page_header { - height: 50px; - line-height: 50px; - position: relative; - padding: 0 27px; - margin-bottom: 20px; - font-size: 20px; - font-family: Helvetica, Arial, Freesans, Clean, sans-serif; - background: #FFFFFF; /* old browsers */ - background: -moz-linear-gradient(top, #FFFFFF 0%, #F5F5F5 100%); /* firefox */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(100%,#F5F5F5)); /* webkit */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#F5F5F5',GradientType=0 ); /* ie */ - background: -o-linear-gradient(top, #FFFFFF 0%, #F5F5F5 100%); - border-bottom: 1px solid #dfdfdf; -} - -.page_header a:link, .page_header a:visited { - color: #4183C4; - text-decoration: none; - padding: 3px; - font-weight: bold; -} - -.page_header a:hover { - font-weight: bold; - padding: 3px; - text-decoration: underline; -} - -.page_header a:first-child { - background: transparent; -} - -.page_header img.logo { - position: relative; - top: 7px; - margin-right: 5px; -} - -/* Page Footer ----------------------------------------------------------------------------- */ - -.page_footer { - position: absolute; - left: 0; - bottom: 0; - width: 100%; - height: 80px; - line-height: 80px; - margin-top: 15px; - background: #f1f1f1; - border-top: 2px solid #ddd; - border-bottom: 1px solid #ddd; -} - -.page_footer_text { - color: #666; - display: inline; - float: left; - margin-left: 25px; - width: 80%; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; -} - -a.rss_logo { - float: right; - padding: 3px 1px; - width: 35px; - line-height: 10px; - border: 1px solid; - border-color: #fcc7a5 #7d3302 #3e1a01 #ff954e; - color: #ffffff; - background-color: #ff6600; - font-weight: bold; - font-family: sans-serif; - font-size: 80%; - text-align: center; - text-decoration: none; - margin-top: 30px; - margin-left: 5px; -} - -a.rss_logo:hover { - background-color: #ee5500; -} - -.rss_logo { - margin-right: 25px; - background: yellow; -} - -.rss_logo:last-child { - margin-right: 5px; -} - -/* Index include ----------------------------------------------------------------------------- */ - -.index_include { - width: 95%; - margin: 0 auto 15px; - background: -moz-linear-gradient(center top , #FFFFFF 0%, #F5F5F5 100%) repeat scroll 0 0 transparent; - border: 1px solid #DFDFDF; - padding: 8px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -/* Elements ----------------------------------------------------------------------------- */ - -.project_list, -.shortlog, -.tree, -.commit_search, -.history { - width: 95%; - margin: 0 auto 15px auto; - border: 1px solid #d8d8d8; - -moz-box-shadow: 0 0 3px rgba(0,0,0,0.2); - -webkit-box-shadow: 0 0 3px rgba(0,0,0,0.2); - box-shadow: 0 0 3px rgba(0,0,0,0.2); -} - -.project_list th, -.shortlog th, -.tree th, -.commit_search th { - color: #afafaf; - font-weight: normal; -} - -.project_list th { - font-weight: bold; -} - -.project_list tr, -.shortlog tr, -.tree tr, -.commit_search tr { - background: #eaeaea; - height: 2.5em; - text-align: left; - color: #545454; -} - -.project_list tr.dark, .project_list tr.light, -.shortlog tr.dark, .shortlog tr.light, -.tree tr.dark, .tree tr.light, -.commit_search tr.dark, .commit_search tr.light, -.history tr.dark, .history tr.light, -.heads tr.dark, .heads tr.light { - background: #F9F9F9; /* old browsers */ - background: -moz-linear-gradient(top, #F9F9F9 0%, #EFEFEF 100%); /* firefox */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F9F9F9), color-stop(100%,#EFEFEF)); /* webkit */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F9F9F9', endColorstr='#EFEFEF',GradientType=0 ); /* ie */ - background: -o-linear-gradient(top, #F9F9F9 0%, #EFEFEF 100%); - height: 2.5em; - border-bottom: 1px solid #e1e1e1; -} - -th .header { - background: transparent; - border: 0; - padding: 0; - font-weight: bold; -} - -.tree { - width: 100%; - margin: 0; -} - -.projsearch { - position: absolute; - right: 4%; - top: 15px; -} - -.projsearch a { - display: none; -} - -.commit_search { - background: #eaeaea; -} - -.page_nav, -.list_head, -.page_path, -.search { - width: 94%; - background: #eaeaea; - color: #545454; - border: 1px solid #d8d8d8; - padding: 5px; - margin: 0 auto 15px auto; -} - -.history { - background: #eaeaea; -} - -.title { - margin: 0 auto 15px auto; - padding: 5px; - width: 95%; -} - -.readme { - background: #eaf2f5; - border: 1px solid #bedce7; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - margin: 0 auto 15px auto; - padding: 15px; - width: 95%; -} - -.readme h1 { - display: block; - font-size: 2em; - font-weight: bold; - margin-bottom: 0.67em; - margin-top: 0; -} - -.readme h2 { - font-size: 1.5em; - font-weight: bold; - margin-bottom: 0.83em; -} - - -.readme h3 { - font-size: 1.17em; - font-weight: bold; - margin-bottom: 1em; -} - -.readme p { - margin-bottom: 1em; -} - -.readme ul { - list-style: disc; - margin-bottom: 1em; - margin-left: 1.5em; -} - -.readme ul ul { - margin-bottom: 0; -} - -.readme ol { - list-style: decimal; - margin-bottom: 1em; - margin-left: 1.5em; -} - -.readme ol ol { - margin-bottom: 0; -} - -.readme pre { - font-family: monospace; - margin: 1em 0; - white-space: pre; -} - -.readme tt, .readme code, .readme kbd, .readme samp { - font-family: monospace; -} - -.readme blockquote { - margin: 1em; -} - -.projects_list, -.tags { - width: 95%; - background: #f0f0f0; - color: #545454; - border: 1px solid #d8d8d8; - padding: 5px; - margin: 0 auto 15px auto; -} - -.heads { - width: 95%; - color: #545454; - border: 1px solid #d8d8d8; - padding: 5px; - margin: 0 auto 15px auto; -} - -.header { - width: 94%; - margin: 0 auto 15px auto; - background: #eaf2f5; - border: 1px solid #bedce7; - padding: 5px; -} - -.header .age { - float: left; - color: #000; - font-weight: bold; - width: 10em; -} - -.title_text { - width: 94%; - background: #eaf2f5; - border: 1px solid #bedce7; - padding: 5px; - margin: 0 auto 0 auto; -} - -.log_body { - width: 94%; - background: #eaf2f5; - border: 1px solid #bedce7; - border-top: 0; - padding: 5px; - margin: 0 auto 15px auto; -} - -.page_body { - line-height: 1.4em; - width: 94%; - background: #f8f8f8; - border: 1px solid #d8d8d8; - padding: 5px; - margin: 15px auto 15px auto; -} - -.diff_tree { - width: 95%; - background: #f0f0f0; - border: 1px solid #d8d8d8; - padding: 5px; - margin: 0 auto 15px auto; -} - -.page_body > .list_head { - width: 98.5%; -} - -.page_body > .diff_tree { - width: 99.5%; -} - -.patch > .header { - width: 99%; -} - -.author .avatar, -.author_date .avatar { - position: relative; - top: 3px; -} - -.object_header .avatar { - border: 1px solid #D8D8D8; - float: right; -} - -.object_header td, -.object_header th { - vertical-align: top; -} - -/* Refs ----------------------------------------------------------------------------- */ - -span.refs span { - color: #707070; - display: inline-block; - margin: 0; - background-color: #eee; - border: 1px solid #ccc; - border-radius: 3px; - height: 18px; - padding: 0 6px; - text-overflow: ellipsis; -} - -span.refs span.ref { - color: #707070; - display: inline-block; - margin: 0; - background-color: #c4c4ff; - border: 1px solid #7878ff; - border-radius: 3px; - height: 18px; - padding: 0 6px; - text-overflow: ellipsis; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gIKFSUnpolg7AAAAHJQTFRFAAAAVVWqZmbMVVXVYGDgbW3td3fuc3PzdHT0cHD1d3f6dHT6dnb7dHT7dnb8dnb8dnb9d3f9dnb+eHj+d3f+eHj+d3f+d3f+d3f+eHj+d3f+eHj+d3f+eHj+d3f+d3f+eHj+d3f+d3f+d3f+eHj/////V9oQhQAAACR0Uk5TAAIEBQcNDhMVGCotNTZAT217i5CgobvExtjZ4eLr7vP09ff7uqQ6cgAAAAFiS0dEJcMByQ8AAABUSURBVBjTpc43AoAwDENRh95bgNBM1f3PyOpslD++RSJ61YgH5M2IbIkn4GocSR1MZVBL4t2n4FgkbaxI8Sqph041WknZCWAIrcmEUbpf3lNe0N9u59YFYHnZ78gAAAAASUVORK5CYII=); - background-repeat: no-repeat; - padding-left: 18px; -} - -span.refs span.tag { - color: #707070; - display: inline-block; - margin: 0; - background-color: #ffffab; - border: 1px solid #d9d93b; - border-radius: 3px; - height: 18px; - padding: 0 6px; - text-overflow: ellipsis; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gIKFSUZZ+h9RwAAAGZQTFRFAAAAtrYkwMBAwMBAx8c4yso11NQ71NQ51dU52Ng71tY519c719c719c62Ng719c719c62Ng72dk62Ng62Ng72Ng72dk62Ng72Ng62dk62dk72dk62Ng62dk72Ng72Ng72dk7////ou/AnQAAACB0Uk5TAAYHCxESLjRCWWlqa4uNkpissbrO19jc3ufs8vf6/f7atAU2AAAAAWJLR0QhxGwNFgAAAF1JREFUGFeNy0cOgCAABVGw94rY5d//lC7omhhn+ZIh5Gf1xPk0Zi5dAABROIQjSU/fsAXhDkCUljAv8jW2wlQpaixpo4Nj+dtatVpjkSJjLNaizRVpvhBCu/4h391jzw1lU12Z7wAAAABJRU5ErkJggg==); - background-repeat: no-repeat; - padding-left: 18px; -} - -span.refs span.head { - color: #707070; - display: inline-block; - margin: 0; - background-color: #c4ffc4; - border: 1px solid #78ff78; - border-radius: 3px; - height: 18px; - padding: 0 6px; - text-overflow: ellipsis; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gIKFSYDsafX/gAAAUpJREFUOMvVkjFLA0EQhd/s7l06MSCihbV/wC5/QBDEIFYWprRIIQQJFqKFQi4kUbBQsFSwtrUQLQULUTBFLCzVIgimCXe7z0q5yIWcqfRVwzDzMTNvgL8mSUqWw3JOtFQJdsIwLDYyjdYgkEmkazl2oVtQWk36nn8AYBYASmFpxmizGtnoqO7Vb+M9KglEkASdpWU872nvVCiPRpuTnz2JIHGyqX3d0kZfR1G0Ht+g/do+FIhOBbLW3n/FNb/28D0puZ+dyL44ur1UoH5yzt2JyIj6UGdDgwrPhYzSagNEszJaeU/lWlylbmnaeGZZICsAppxzi6nt73HK85oQCMknOuarpno+FIjglVjZDXaCS2yDv3rIHlCb88FY0BlUl3hs7ektkhckb5DFWhoz+n12zr7ZPLpYUqLm0oBMn8NUzLhpAgjpWMS/1CcSJ3ykD7Rk1QAAAABJRU5ErkJggg==); - background-repeat: no-repeat; - padding-left: 18px; -} - -span.refs a { - color: #4e4e4e; - font: 11px "Bitstream Vera Sans Mono", "DejaVu Sans Mono", Monaco, monospace; - line-height: 18px; -} - -/* Diffs ----------------------------------------------------------------------------- */ - -div.diff.to_file a.path, -div.diff.to_file { - color: #007000; -} - -div.diff.from_file a.path, -div.diff.from_file { - color: #aa0000; -} - -.patch .header { - margin: 0; -} - -.patchset { - overflow-x: auto; - overflow-y: hidden; -} - -.chunk_header { - background: #eaf2f5; - color: #999; -} - -.rem { - background: #ffdddd; -} -.rem .marked { - background: #ffaaaa; -} -.add { - background: #ddffdd; -} -.add .marked { - background: #7dff7d; -} - -.extended_header { - width: 99.5%; -} - -div.chunk_block { - overflow: hidden; -} - -div.chunk_block div.old { - float: left; - width: 50%; - overflow: hidden; - border-right: 5px solid #EAF2F5; -} - -div.chunk_block.rem, -div.chunk_block.add { - background: transparent; -} - -div.chunk_block div.old .add, -div.chunk_block div.old .rem { - padding-right: 3px; -} - -div.chunk_block div.new .add, -div.chunk_block div.new .rem { - padding-left: 3px; -} - -div.chunk_block div.new { - margin-left: 50%; - width: 50%; - border-left: 5px solid #EAF2F5; -} - -/* Category ----------------------------------------------------------------------------- */ - -td.category { - background: #E6F1F6; /* old browsers */ - background: -moz-linear-gradient(top, #C8D8E7 0%, #E6F1F3 100%); /* firefox */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#C8D8E7), color-stop(100%,#E6F1F3)); /* webkit */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C8D8E7', endColorstr='#E6F1F3',GradientType=0 ); /* ie */ - background: -o-linear-gradient(top, #C8D8E7 0%, #E6F1F3 100%); - font-weight: bold; - border-bottom: 1px solid #D1D1D1; - border-top: 1px solid #D1D1D1; -} - -/* Age ----------------------------------------------------------------------------- */ - -/* noage: "No commits" */ -.project_list td.noage { - color: #cdcdcd; -} - -/* age2: 60*60*24*2 <= age */ -.project_list td.age2, .blame td.age2 { - color: #545454; -} - -/* age1: 60*60*2 <= age < 60*60*24*2 */ -.project_list td.age1 { - color: #009900; -} - -/* age0: age < 60*60*2 */ -.project_list td.age0 { - color: #009900; - font-weight: bold; -} - -/* File status ----------------------------------------------------------------------------- */ - -.diff_tree span.file_status.new { - color: #008000; -} - -table.diff_tree span.file_status.deleted { - color: #c00000; -} - -table.diff_tree span.file_status.moved, -table.diff_tree span.file_status.mode_chnge { - color: #545454; -} - -table.diff_tree span.file_status.copied { - color: #70a070; -} - -span.cntrl { - border: dashed #aaaaaa; - border-width: 1px; - padding: 0px 2px 0px 2px; - margin: 0px 2px 0px 2px; -} - -span.match { - background: #aaffaa; - color: #000; -} - -td.error { - color: red; - background: yellow; -} - -/* blob view */ - -td.pre, div.pre, div.diff { - white-space: pre-wrap; -} - -/* JavaScript-based timezone manipulation */ - -.popup { /* timezone selection UI */ - position: absolute; - /* "top: 0; right: 0;" would be better, if not for bugs in browsers */ - top: 0; left: 0; - border: 1px solid #d8d8d8; - padding: 2px; - background-color: #f0f0f0; - font-style: normal; - color: #545454; - cursor: auto; -} - -.close-button { /* close timezone selection UI without selecting */ - /* float doesn't work within absolutely positioned container, - * if width of container is not set explicitly */ - /* float: right; */ - position: absolute; - top: 0px; right: 0px; - border: 1px solid #ffaaaa; - margin: 1px 1px 1px 1px; - padding-bottom: 2px; - width: 12px; - height: 10px; - font-size: 9px; - font-weight: bold; - text-align: center; - background-color: #ffdddd; - cursor: pointer; -} - -/* Style definition generated by highlight 2.4.5, http://www.andre-simon.de/ */ - -/* Highlighting theme definition: */ - -.num { color:#6ecf36; } -.esc { color:#ff00ff; } -.str { color:#ff00d3; background-color: #edc9ec } -.dstr { color:#818100; } -.slc { color:#838183; font-style:italic; } -.com { color:#838183; font-style:italic; } -.dir { color:#008200; } -.sym { color:#000000; } -.line { color:#555555; } -.kwa { color:#666666; font-weight:bold; } -.kwb { color:#6b3099; } -.kwc { color:#d4663d; } -.kwd { color:#2928ff; } - -/**** Styles supplémentaires *****/ - -.readme div.toc { - float: right; - border: 1px solid black; - background-color: white; -} -.readme div.toc span.toctitle { - display: inline-block; - width: 100%; - text-align: center; - font-weight: bold; -} - -.readme table { - background-color: white; -} - -.readme table thead tr { - background-color: #ccc; -} - -.readme table tbody tr:nth-child(2n) { - background-color: #f8f8f8; -} - -.readme table td, .readme table th { - border: 1px solid black; -} diff --git a/nixops/modules/websites/tools/git/gitweb/theme/gitweb.js b/nixops/modules/websites/tools/git/gitweb/theme/gitweb.js deleted file mode 100644 index 72f3cfa..0000000 --- a/nixops/modules/websites/tools/git/gitweb/theme/gitweb.js +++ /dev/null @@ -1,27 +0,0 @@ -function include(filename, onload) { - var head = document.getElementsByTagName('head')[0]; - var script = document.createElement('script'); - script.src = filename; - script.type = 'text/javascript'; - script.onload = script.onreadystatechange = function() { - if (script.readyState) { - if (script.readyState === 'complete' || script.readyState === 'loaded') { - script.onreadystatechange = null; - onload(); - } - } - else { - onload(); - } - } - head.appendChild(script); -} - -include('static/gitweb.js', function() {}); -include('//code.jquery.com/jquery-3.1.0.min.js', function() { - $("div.title").each(function(index, element) { - if ($(element).text() === "readme" || $(element).text() === " ") { - $(element).hide(); - } - }); -}); diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix index 9be9d5d..827c563 100644 --- a/nixops/modules/websites/tools/tools/default.nix +++ b/nixops/modules/websites/tools/tools/default.nix @@ -248,12 +248,6 @@ in { ln -s ${kanboard.webRoot} $out/webapps/${kanboard.apache.webappName} ''; - nixpkgs.overlays = [ (self: super: rec { - ympd = super.ympd.overrideAttrs(old: mylibs.fetchedGithub ./ympd.json // { - patches = (old.patches or []) ++ [ ./ympd-password-env.patch ]; - }); - }) ]; - systemd.services.tt-rss = { description = "Tiny Tiny RSS feeds update daemon"; serviceConfig = { diff --git a/nixops/modules/websites/tools/tools/ympd-password-env.patch b/nixops/modules/websites/tools/tools/ympd-password-env.patch deleted file mode 100644 index 2bbe188..0000000 --- a/nixops/modules/websites/tools/tools/ympd-password-env.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/ympd.c b/src/ympd.c -index 3aed7e6..b3b6fda 100644 ---- a/src/ympd.c -+++ b/src/ympd.c -@@ -71,6 +71,7 @@ int main(int argc, char **argv) - char *run_as_user = NULL; - char const *error_msg = NULL; - char *webport = "8080"; -+ const char *s; - - atexit(bye); - #ifdef WITH_DYNAMIC_ASSETS -@@ -92,6 +93,10 @@ int main(int argc, char **argv) - {0, 0, 0, 0 } - }; - -+ if ((s = getenv("MPD_PASSWORD")) != NULL) { -+ mpd.password = strdup(s); -+ } -+ - while((n = getopt_long(argc, argv, "h:p:w:u:vm:", - long_options, &option_index)) != -1) { - switch (n) { diff --git a/nixops/modules/websites/tools/tools/ympd.json b/nixops/modules/websites/tools/tools/ympd.json deleted file mode 100644 index 51f06d5..0000000 --- a/nixops/modules/websites/tools/tools/ympd.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "612f8fc-master", - "meta": { - "name": "ympd", - "url": "https://github.com/notandy/ympd", - "branch": "master" - }, - "github": { - "owner": "notandy", - "repo": "ympd", - "rev": "612f8fc0b2c47fc89d403e4a044541c6b2b238c8", - "sha256": "01hnj10zl103mrn82vyd42fvq7w5az3jf1qz18889zv67kn73ll9", - "fetchSubmodules": true - } -} -- cgit v1.2.3