diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 01:35:06 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2023-10-04 02:11:48 +0200 |
commit | 1a64deeb894dc95e2645a75771732c6cc53a79ad (patch) | |
tree | 1b9df4838f894577a09b9b260151756272efeb53 /modules/private/websites/tools/git | |
parent | fa25ffd4583cc362075cd5e1b4130f33306103f0 (diff) | |
download | Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.tar.gz Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.tar.zst Nix-1a64deeb894dc95e2645a75771732c6cc53a79ad.zip |
Squash changes containing private information
There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository
Diffstat (limited to 'modules/private/websites/tools/git')
-rw-r--r-- | modules/private/websites/tools/git/default.nix | 49 | ||||
-rw-r--r-- | modules/private/websites/tools/git/gitweb.nix | 119 | ||||
-rw-r--r-- | modules/private/websites/tools/git/mantisbt.nix | 91 |
3 files changed, 0 insertions, 259 deletions
diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix deleted file mode 100644 index 8f611ee..0000000 --- a/modules/private/websites/tools/git/default.nix +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | { lib, pkgs, config, ... }: | ||
2 | let | ||
3 | mantisbt = pkgs.callPackage ./mantisbt.nix { | ||
4 | inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins; | ||
5 | env = config.myEnv.tools.mantisbt; | ||
6 | inherit config; | ||
7 | }; | ||
8 | gitweb = pkgs.callPackage ./gitweb.nix { | ||
9 | gitoliteDir = config.myServices.gitolite.gitoliteDir; | ||
10 | }; | ||
11 | |||
12 | cfg = config.myServices.websites.tools.git; | ||
13 | in { | ||
14 | options.myServices.websites.tools.git = { | ||
15 | enable = lib.mkEnableOption "enable git's website"; | ||
16 | }; | ||
17 | |||
18 | config = lib.mkIf cfg.enable { | ||
19 | secrets.keys = mantisbt.keys; | ||
20 | services.websites.env.tools.modules = | ||
21 | gitweb.apache.modules ++ | ||
22 | mantisbt.apache.modules; | ||
23 | |||
24 | system.activationScripts.mantisbt = mantisbt.activationScript; | ||
25 | services.websites.env.tools.vhostConfs.git = { | ||
26 | certName = "eldiron"; | ||
27 | addToCerts = true; | ||
28 | hosts = ["git.immae.eu" ]; | ||
29 | root = gitweb.apache.root; | ||
30 | extraConfig = [ | ||
31 | gitweb.apache.vhostConf | ||
32 | (mantisbt.apache.vhostConf config.services.phpfpm.pools.mantisbt.socket) | ||
33 | '' | ||
34 | RewriteEngine on | ||
35 | RewriteCond %{REQUEST_URI} ^/releases | ||
36 | RewriteRule /releases(.*) https://release.immae.eu$1 [P,L] | ||
37 | '' | ||
38 | ]; | ||
39 | }; | ||
40 | services.phpfpm.pools = { | ||
41 | mantisbt = { | ||
42 | user = config.services.httpd.Tools.user; | ||
43 | group = config.services.httpd.Tools.group; | ||
44 | settings = mantisbt.phpFpm.pool; | ||
45 | phpPackage = pkgs.php72; | ||
46 | }; | ||
47 | }; | ||
48 | }; | ||
49 | } | ||
diff --git a/modules/private/websites/tools/git/gitweb.nix b/modules/private/websites/tools/git/gitweb.nix deleted file mode 100644 index ff34da5..0000000 --- a/modules/private/websites/tools/git/gitweb.nix +++ /dev/null | |||
@@ -1,119 +0,0 @@ | |||
1 | { gitweb, writeText, stdenv, coreutils, writeScript, gitolite, git, cgit, gitoliteDir, mailcap, highlight }: | ||
2 | rec { | ||
3 | varDir = gitoliteDir; | ||
4 | config = writeText "gitweb.conf" '' | ||
5 | $git_temp = "/tmp"; | ||
6 | |||
7 | # The directories where your projects are. Must not end with a | ||
8 | # slash. | ||
9 | $projectroot = "${varDir}/repositories"; | ||
10 | |||
11 | $projects_list = "${varDir}/projects.list"; | ||
12 | $strict_export = "true"; | ||
13 | |||
14 | # Base URLs for links displayed in the web interface. | ||
15 | our @git_base_url_list = qw(ssh://gitolite@git.immae.eu https://git.immae.eu); | ||
16 | |||
17 | $feature{'blame'}{'default'} = [1]; | ||
18 | $feature{'avatar'}{'default'} = ['gravatar']; | ||
19 | $feature{'highlight'}{'default'} = [1]; | ||
20 | |||
21 | @stylesheets = ("gitweb-theme/gitweb.css"); | ||
22 | $logo = "gitweb-theme/git-logo.png"; | ||
23 | $favicon = "gitweb-theme/git-favicon.png"; | ||
24 | $javascript = "gitweb-theme/gitweb.js"; | ||
25 | $logo_url = "https://git.immae.eu/"; | ||
26 | $projects_list_group_categories = "true"; | ||
27 | $projects_list_description_width = 60; | ||
28 | $project_list_default_category = "__Others__"; | ||
29 | $highlight_bin = "${highlight}/bin/highlight"; | ||
30 | ''; | ||
31 | aboutFilter = writeScript "about-filter.sh" '' | ||
32 | #!${stdenv.shell} | ||
33 | |||
34 | if [ -f "$CGIT_REPO_PATH/README.html" ]; then | ||
35 | cat "$CGIT_REPO_PATH/README.html" | ||
36 | else | ||
37 | ${cgit}/lib/cgit/filters/about-formatting.sh "$@" | ||
38 | fi | ||
39 | ''; | ||
40 | cgitConfig = writeText "cgitrc" '' | ||
41 | css=/cgit-css/cgit.css | ||
42 | logo=/cgit-css/cgit.png | ||
43 | favicon=/cgit-css/favicon.ico | ||
44 | |||
45 | root-title=Immae’s git | ||
46 | root-desc=To go back to the old interface: https://git.immae.eu/?old | ||
47 | readme=:README.md | ||
48 | readme=:readme.md | ||
49 | readme=:README | ||
50 | readme=:DOCUMENTATION.md | ||
51 | about-filter=${aboutFilter} | ||
52 | #${cgit}/lib/cgit/filters/about-formatting.sh | ||
53 | source-filter=${cgit}/lib/cgit/filters/syntax-highlighting.py | ||
54 | |||
55 | enable-blame=1 | ||
56 | enable-index-links=1 | ||
57 | enable-commit-graph=1 | ||
58 | enable-log-filecount=1 | ||
59 | enable-log-linecount=1 | ||
60 | |||
61 | enable-html-serving=1 | ||
62 | # Allow using gitweb.* keys | ||
63 | enable-git-config=1 | ||
64 | |||
65 | side-by-side-diffs=1 | ||
66 | snapshots=tar.gz tar.zst zip | ||
67 | mimetype-file=${mailcap}/etc/mime.types | ||
68 | |||
69 | section=__Others__ | ||
70 | clone-url=ssh://gitolite@git.immae.eu/$CGIT_REPO_URL https://git.immae.eu/$CGIT_REPO_URL | ||
71 | #section-from-path=1 | ||
72 | project-list=${varDir}/projects.list | ||
73 | scan-path=${varDir}/repositories | ||
74 | ''; | ||
75 | apache = rec { | ||
76 | user = "wwwrun"; | ||
77 | group = "wwwrun"; | ||
78 | modules = [ "cgid" ]; | ||
79 | root = gitweb; | ||
80 | vhostConf = '' | ||
81 | SetEnv GIT_PROJECT_ROOT ${varDir}/repositories/ | ||
82 | ScriptAliasMatch \ | ||
83 | "(?x)^/(.*/(HEAD | \ | ||
84 | info/refs | \ | ||
85 | objects/(info/[^/]+ | \ | ||
86 | [0-9a-f]{2}/[0-9a-f]{38} | \ | ||
87 | pack/pack-[0-9a-f]{40}\.(pack|idx)) | \ | ||
88 | git-(upload|receive)-pack))$" \ | ||
89 | ${git}/libexec/git-core/git-http-backend/$1 | ||
90 | |||
91 | <Directory "${git}/libexec/git-core"> | ||
92 | Require all granted | ||
93 | </Directory> | ||
94 | <Directory "${root}"> | ||
95 | DirectoryIndex gitweb.cgi | ||
96 | Require all granted | ||
97 | AllowOverride None | ||
98 | Options ExecCGI FollowSymLinks | ||
99 | <Files gitweb.cgi> | ||
100 | SetHandler cgi-script | ||
101 | SetEnv GITWEB_CONFIG "${config}" | ||
102 | </Files> | ||
103 | </Directory> | ||
104 | |||
105 | SetEnv CGIT_CONFIG ${cgitConfig} | ||
106 | ScriptAlias /cgit "${cgit}/cgit/cgit.cgi/" | ||
107 | Alias /cgit-css "${cgit}/cgit" | ||
108 | <Directory "${cgit}/cgit/"> | ||
109 | AllowOverride None | ||
110 | Options ExecCGI FollowSymlinks | ||
111 | Require all granted | ||
112 | </Directory> | ||
113 | |||
114 | RewriteEngine On | ||
115 | RewriteCond %{QUERY_STRING} ^$ | ||
116 | RewriteRule ^/?$ /cgit [L,R=302] | ||
117 | ''; | ||
118 | }; | ||
119 | } | ||
diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix deleted file mode 100644 index 2ef76af..0000000 --- a/modules/private/websites/tools/git/mantisbt.nix +++ /dev/null | |||
@@ -1,91 +0,0 @@ | |||
1 | { env, mantisbt_2, mantisbt_2-plugins, config }: | ||
2 | rec { | ||
3 | activationScript = { | ||
4 | deps = [ "httpd" ]; | ||
5 | text = '' | ||
6 | install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/mantisbt | ||
7 | ''; | ||
8 | }; | ||
9 | keys."webapps/tools-mantisbt" = { | ||
10 | user = apache.user; | ||
11 | group = apache.group; | ||
12 | permissions = "0400"; | ||
13 | text = '' | ||
14 | <?php | ||
15 | $g_hostname = '${env.postgresql.socket}'; | ||
16 | $g_db_username = '${env.postgresql.user}'; | ||
17 | $g_db_password = '${env.postgresql.password}'; | ||
18 | $g_database_name = '${env.postgresql.database}'; | ||
19 | $g_db_type = 'pgsql'; | ||
20 | $g_crypto_master_salt = '${env.master_salt}'; | ||
21 | $g_allow_signup = OFF; | ||
22 | $g_allow_anonymous_login = ON; | ||
23 | $g_anonymous_account = 'anonymous'; | ||
24 | |||
25 | $g_phpMailer_method = PHPMAILER_METHOD_SENDMAIL; | ||
26 | $g_smtp_host = 'localhost'; | ||
27 | $g_smtp_username = '''; | ||
28 | $g_smtp_password = '''; | ||
29 | $g_webmaster_email = 'mantisbt@tools.immae.eu'; | ||
30 | $g_from_email = 'mantisbt@tools.immae.eu'; | ||
31 | $g_return_path_email = 'mantisbt@tools.immae.eu'; | ||
32 | $g_from_name = 'Mantis Bug Tracker at git.immae.eu'; | ||
33 | $g_email_receive_own = ON; | ||
34 | # --- LDAP --- | ||
35 | $g_login_method = LDAP; | ||
36 | $g_ldap_protocol_version = 3; | ||
37 | $g_ldap_server = 'ldaps://${env.ldap.host}:636'; | ||
38 | $g_ldap_root_dn = 'ou=users,${env.ldap.base}'; | ||
39 | $g_ldap_bind_dn = '${env.ldap.dn}'; | ||
40 | $g_ldap_bind_passwd = '${env.ldap.password}'; | ||
41 | $g_use_ldap_email = ON; | ||
42 | $g_use_ldap_realname = ON; | ||
43 | $g_ldap_uid_field = 'uid'; | ||
44 | $g_ldap_realname_field = 'cn'; | ||
45 | $g_ldap_organization = '${env.ldap.filter}'; | ||
46 | ''; | ||
47 | }; | ||
48 | webRoot = (mantisbt_2.override { mantis_config = config.secrets.fullPaths."webapps/tools-mantisbt"; }).withPlugins (p: [p.slack p.source-integration]); | ||
49 | apache = rec { | ||
50 | user = "wwwrun"; | ||
51 | group = "wwwrun"; | ||
52 | modules = [ "proxy_fcgi" ]; | ||
53 | root = webRoot; | ||
54 | vhostConf = socket: '' | ||
55 | Alias /mantisbt "${root}" | ||
56 | <Directory "${root}"> | ||
57 | DirectoryIndex index.php | ||
58 | <FilesMatch "\.php$"> | ||
59 | SetHandler "proxy:unix:${socket}|fcgi://localhost" | ||
60 | </FilesMatch> | ||
61 | |||
62 | AllowOverride All | ||
63 | SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 | ||
64 | Options FollowSymlinks | ||
65 | Require all granted | ||
66 | </Directory> | ||
67 | <Directory "${root}/admin"> | ||
68 | #Reenable during upgrade | ||
69 | Require all denied | ||
70 | </Directory> | ||
71 | ''; | ||
72 | }; | ||
73 | phpFpm = rec { | ||
74 | serviceDeps = [ "postgresql.service" "openldap.service" ]; | ||
75 | basedir = builtins.concatStringsSep ":" ( | ||
76 | [ webRoot config.secrets.fullPaths."webapps/tools-mantisbt" ] | ||
77 | ++ webRoot.plugins); | ||
78 | pool = { | ||
79 | "listen.owner" = apache.user; | ||
80 | "listen.group" = apache.group; | ||
81 | "pm" = "ondemand"; | ||
82 | "pm.max_children" = "60"; | ||
83 | "pm.process_idle_timeout" = "60"; | ||
84 | |||
85 | "php_admin_value[upload_max_filesize]" = "5000000"; | ||
86 | |||
87 | "php_admin_value[open_basedir]" = "${basedir}:/tmp:/var/lib/php/sessions/mantisbt"; | ||
88 | "php_admin_value[session.save_path]" = "/var/lib/php/sessions/mantisbt"; | ||
89 | }; | ||
90 | }; | ||
91 | } | ||