Commit graph

76 commits

Author SHA1 Message Date
Nicolas Jeannerod 14de9dec55 Remove SSL in VM 2024-09-24 14:52:13 +02:00
Nicolas Jeannerod af4f77a767 s/port/internalPort 2024-09-24 14:42:18 +02:00
Nicolas Jeannerod 08eac749dd Move Garage VM stuff out of main file 2024-09-24 14:40:35 +02:00
Nicolas Jeannerod 00384a5948 domainForBucket 2024-09-24 14:23:29 +02:00
Nicolas Jeannerod 7f1e5b56d0 s/urlFor/urlForBucket 2024-09-24 14:17:56 +02:00
Taeer Bar-Yam 72fa686540 acme fixup 2 2024-09-23 12:39:55 -04:00
Taeer Bar-Yam 2a28e0289d acme fixup 2024-09-23 12:39:15 -04:00
Taeer Bar-Yam 2364e122a2 httpS 2024-09-23 12:22:40 -04:00
Taeer Bar-Yam a65c55f7a1 ADD http:// to proxypass 2024-09-23 12:18:22 -04:00
Taeer Bar-Yam 682f8d6776 remove http:// from nginx server name 2024-09-23 12:14:40 -04:00
Taeer Bar-Yam c15009f490 mv {,internal}port 2024-09-23 12:11:04 -04:00
Taeer Bar-Yam 581b64b77b had two 'cfg's. changed one to 'fedicfg' 2024-09-23 12:09:16 -04:00
Taeer Bar-Yam 8d612a712d ; 2024-09-23 11:58:49 -04:00
Taeer Bar-Yam a02a741ec4 proxy garage web to port 80 2024-09-23 11:55:54 -04:00
Nicolas Jeannerod 900c92ac01 Exceptionally use non-staging LetsEncrypt servers 2024-09-20 18:55:00 +02:00
Nicolas Jeannerod a2c54ff172 ACME 2024-09-20 18:51:21 +02:00
Nicolas Jeannerod d1f58573d8 Also open HTTPS port 2024-09-20 18:44:47 +02:00
Nicolas Jeannerod c47256d62c Ignore errors of garage key import 2024-09-20 18:39:32 +02:00
Nicolas Jeannerod 351649c2dd [HACK] comment out virtualisation 2024-09-20 18:25:21 +02:00
Nicolas Jeannerod 81ab439777 Move stuff from pixelfed-vm to pixelfed 2024-09-20 17:56:40 +02:00
Nicolas Jeannerod 7665609827 Use common options also in tests 2024-09-20 15:45:53 +00:00
Nicolas Jeannerod bbf5f50432 Note on style choice for eg. fediversity.internal.pixelfed.domain 2024-09-20 17:20:31 +02:00
Nicolas Jeannerod ecda4f249d Rework definition of “constants”
- make things such as `fediversity.garage.api.port` into actual options
  with the right default value
- move them under `fediversity.internal`

Co-authored-by: Taeer Bar-Yam <taeer.bar-yam@moduscreate.com>
2024-09-20 17:13:35 +02:00
Nicolas Jeannerod 29c86aedff s/types.string/types.str/
`types.string` was being used for too many thing so it got deprecated
and now there are several different string types. `types.str` is the one
where you don't want to merge definitions if it's defined in more than
one place

Co-authored-by: Taeer Bar-Yam <taeer.bar-yam@moduscreate.com>
2024-09-20 16:35:21 +02:00
Nicolas Jeannerod cf5139836e s/mkOption/mkEnableOption 2024-09-20 16:34:08 +02:00
Nicolas Jeannerod 492a199866 Factorise services URIs 2024-09-17 17:58:09 +02:00
Nicolas Jeannerod 61eb2d9081 Factorise Garage URIs 2024-09-17 17:52:54 +02:00
Nicolas Jeannerod 069b1ddb6c Move Fediversity modules under top-level module 2024-09-17 15:16:11 +02:00
Nicolas Jeannerod 4b379af4ff Move Fediversity modules into own subdirectory 2024-09-17 14:27:24 +02:00
Nicolas Jeannerod 059a76d933 Move VM-specific stuff in a subdirectory 2024-09-17 14:26:21 +02:00
Nicolas Jeannerod 813c1ca879 Some fixes to the Pixelfed/Garage test 2024-09-17 13:35:51 +02:00
Taeer Bar-Yam c2fd51baac stop threading email and password around as arguments 2024-09-10 08:50:54 -04:00
Nicolas Jeannerod 2dca2caca3 Wait until Garage is up by polling port 3900 2024-09-10 12:41:53 +00:00
Nicolas Jeannerod 9346bcca3d Check that src points to Garage 2024-09-10 12:17:32 +00:00
Taeer Bar-Yam 3652a443b1 test image gets uploaded to garage 2024-09-09 10:13:23 -04:00
Taeer Bar-Yam 5b26cfc7a9 nicer timing for video 2024-09-09 10:13:13 -04:00
Taeer Bar-Yam a2da2f48b2 use fediversity logo 2024-09-09 10:12:54 -04:00
Nicolas Jeannerod a49a2b57df Run Magick on the server but with right path 2024-09-09 14:25:42 +02:00
Nicolas Jeannerod 2f44a729c2 Follow things graphically 2024-09-09 14:23:05 +02:00
Nicolas Jeannerod 680f54f7d5 Fix logging and Selenium script 2024-09-09 14:23:05 +02:00
Nicolas Jeannerod b38ec1a62a Cleanup 2024-09-09 14:23:05 +02:00
Taeer Bar-Yam a245729765 patch pixelfed to give nginx read permissions
this way we don't need DANGEROUSLY_SET_FILESYSTEM_DRIVER
2024-09-05 12:03:35 -04:00
Taeer Bar-Yam b24411f44b this configuration also works (without nginx config) 2024-09-05 11:06:55 -04:00
Nicolas Jeannerod e4d84d7881 Run pixelfed-data-setup only after ensure-garage 2024-09-05 15:33:47 +02:00
Nicolas Jeannerod 60cf77e66e Make ensure-garage a oneshot service 2024-09-05 15:32:34 +02:00
Nicolas Jeannerod 1932a131e0 Proxy Garage backend 2024-09-05 13:05:29 +02:00
Nicolas Jeannerod afb8d56dd6 DANGEROUSLY fix everything 2024-09-04 18:30:55 +02:00
Taeer Bar-Yam 7b204eb2ce some more ignores 2024-09-02 12:10:01 -04:00
Taeer Bar-Yam 1a92108475 attempt to access garage storage correctly
nginx was trying to access the files on disk, rather than via s3 storage
2024-09-02 12:09:10 -04:00
Taeer Bar-Yam f8af95f9ab garage defaults
without this ensureKeys and ensureBuckets Must be set or nixos won't
build
2024-09-02 12:08:14 -04:00