diff --git a/.provision/ansible-role-lutim/templates/lutim.conf.j2 b/.provision/ansible-role-lutim/templates/lutim.conf.j2 index 568869c..d5e7065 100644 --- a/.provision/ansible-role-lutim/templates/lutim.conf.j2 +++ b/.provision/ansible-role-lutim/templates/lutim.conf.j2 @@ -240,7 +240,7 @@ # array of memcached servers to cache URL in order to accelerate responses to often-viewed URL. # If set to [], the use of memcached is disabled. # If you use memcached, the internal cache (see cache_max_size option above) will not be used. - # Please see https://framagit.org/luc/lutim/wikis/memcached to know how to configure your memcached + # Please see https://framagit.org/fiat-tux/hat-softwares/lutim/-/wikis/memcached to know how to configure your memcached # servers. # exemple of valid value: ['127.0.0.1:11211'] # optional, default is [] diff --git a/CHANGELOG b/CHANGELOG index eab29cc..b09ac48 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ Revision history for Lutim - 🎨 — Use template literals in js - 🐛 — Gallery, zip and random URLs are now updated when closing image dialog box — ➖ — Replace moment.js with Date().toLocaleDateString(…) + - 🩹 — Replace old URL of the project 0.15.0 2023-12-19 - ✨ — Add --nuke option to image command diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a297080..8d99f21 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,3 @@ # Contributing -See how to contribute on the [wiki](https://framagit.org/luc/lutim/wikis/contribute). +See how to contribute on the [wiki](https://framagit.org/fiat-tux/hat-softwares/lutim/-/wikis/contribute). diff --git a/Dockerfile b/Dockerfile index e809dcb..2594cfe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ ARG VCS_REF ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.name="Lets Upload That Image" \ - org.label-schema.url="https://lut.im/" \ + org.label-schema.url="https://lutim.fiat-tux.fr/" \ org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url="https://git.framasoft.org/luc/lutim" \ + org.label-schema.vcs-url="https://framagit.org/fiat-tux/hat-softwares/lutim" \ org.label-schema.vendor="Luc Didry" \ org.label-schema.version=$VERSION \ org.label-schema.schema-version="1.0" @@ -45,4 +45,4 @@ RUN apk --no-cache add perl~=5 \ USER lutim EXPOSE 8080 -ENTRYPOINT ["/bin/sh", "/home/lutim/docker/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/bin/sh", "/home/lutim/docker/entrypoint.sh"] diff --git a/README.md b/README.md index 042374d..7301a75 100644 --- a/README.md +++ b/README.md @@ -11,20 +11,17 @@ Images are indefinitely stored unless you request that they will be deleted at f ## License Lutim is licensed under the terms of the AGPL. See the LICENSE file. -## Official instance -You can see it working at https://lut.im. - ## Logo Lutim's logo is an adaptation of [Lutin](http://commons.wikimedia.org/wiki/File:Lutin_by_godo.jpg) by [Godo](http://godoillustrateur.wordpress.com/), licensed under the terms of the CC-BY-SA 3.0 license. -![Lutim's logo](https://lut.im/img/Lutim_small.png) +![Lutim's logo](https://lutim.fiat-tux.fr/img/Lutim_small.png) ## Wiki -The official wiki contains all you need to know about Lutim (installation, API, etc.). Go to or clone it: +The official wiki contains all you need to know about Lutim (installation, API, etc.). Go to or clone it: ``` -git clone https://framagit.org/luc/lutim.wiki.git +git clone https://framagit.org/fiat-tux/hat-softwares/lutim.wiki.git ``` ## Encryption @@ -43,9 +40,9 @@ See [AUTHORS.md](AUTHORS.md) file. ## Contribute! -Please consider contributing, either by [reporting issues](https://framagit.org/luc/lutim/issues) or by helping the [internationalization](https://weblate.framasoft.org/projects/lutim/). And of course, code contribution are welcome! +Please consider contributing, either by [reporting issues](https://framagit.org/fiat-tux/hat-softwares/lutim/issues) or by helping the [internationalization](https://weblate.framasoft.org/projects/lutim/). And of course, code contribution are welcome! -The details on how to contribute are on the [wiki](https://framagit.org/luc/lutim/wikis/contribute). +The details on how to contribute are on the [wiki](https://framagit.org/fiat-tux/hat-softwares/lutim/wikis/contribute). ## Make a donation diff --git a/lutim.conf.template b/lutim.conf.template index 1b943c2..b6a55d0 100644 --- a/lutim.conf.template +++ b/lutim.conf.template @@ -239,7 +239,7 @@ # array of memcached servers to cache URL in order to accelerate responses to often-viewed URL. # If set to [], the use of memcached is disabled. # If you use memcached, the internal cache (see cache_max_size option above) will not be used. - # Please see https://framagit.org/luc/lutim/wikis/memcached to know how to configure your memcached + # Please see https://framagit.org/fiat-tux/hat-softwares/lutim/-/wikis/memcached to know how to configure your memcached # servers. # exemple of valid value: ['127.0.0.1:11211'] # optional, default is [] diff --git a/t/postgresql1.conf b/t/postgresql1.conf index 505d9ac..7a7a460 100644 --- a/t/postgresql1.conf +++ b/t/postgresql1.conf @@ -189,7 +189,7 @@ # array of memcached servers to cache URL in order to accelerate responses to often-viewed URL. # If set to [], the use of memcached is disabled. # If you use memcached, the internal cache (see cache_max_size option above) will not be used. - # Please see https://framagit.org/luc/lutim/wikis/memcached to know how to configure your memcached + # Please see https://framagit.org/fiat-tux/hat-softwares/lutim/-/wikis/memcached to know how to configure your memcached # servers. # exemple of valid value: ['127.0.0.1:11211'] # optional, default is [] diff --git a/t/postgresql2.conf b/t/postgresql2.conf index 31cd104..3958ed0 100644 --- a/t/postgresql2.conf +++ b/t/postgresql2.conf @@ -189,7 +189,7 @@ # array of memcached servers to cache URL in order to accelerate responses to often-viewed URL. # If set to [], the use of memcached is disabled. # If you use memcached, the internal cache (see cache_max_size option above) will not be used. - # Please see https://framagit.org/luc/lutim/wikis/memcached to know how to configure your memcached + # Please see https://framagit.org/fiat-tux/hat-softwares/lutim/-/wikis/memcached to know how to configure your memcached # servers. # exemple of valid value: ['127.0.0.1:11211'] # optional, default is [] diff --git a/t/postgresql3.conf b/t/postgresql3.conf index d9f4a65..7cb7aed 100644 --- a/t/postgresql3.conf +++ b/t/postgresql3.conf @@ -189,7 +189,7 @@ # array of memcached servers to cache URL in order to accelerate responses to often-viewed URL. # If set to [], the use of memcached is disabled. # If you use memcached, the internal cache (see cache_max_size option above) will not be used. - # Please see https://framagit.org/luc/lutim/wikis/memcached to know how to configure your memcached + # Please see https://framagit.org/fiat-tux/hat-softwares/lutim/-/wikis/memcached to know how to configure your memcached # servers. # exemple of valid value: ['127.0.0.1:11211'] # optional, default is [] diff --git a/t/sqlite1.conf b/t/sqlite1.conf index a91dda7..75f22e5 100644 --- a/t/sqlite1.conf +++ b/t/sqlite1.conf @@ -189,7 +189,7 @@ # array of memcached servers to cache URL in order to accelerate responses to often-viewed URL. # If set to [], the use of memcached is disabled. # If you use memcached, the internal cache (see cache_max_size option above) will not be used. - # Please see https://framagit.org/luc/lutim/wikis/memcached to know how to configure your memcached + # Please see https://framagit.org/fiat-tux/hat-softwares/lutim/-/wikis/memcached to know how to configure your memcached # servers. # exemple of valid value: ['127.0.0.1:11211'] # optional, default is [] diff --git a/t/sqlite2.conf b/t/sqlite2.conf index 655bb14..67e9bcf 100644 --- a/t/sqlite2.conf +++ b/t/sqlite2.conf @@ -189,7 +189,7 @@ # array of memcached servers to cache URL in order to accelerate responses to often-viewed URL. # If set to [], the use of memcached is disabled. # If you use memcached, the internal cache (see cache_max_size option above) will not be used. - # Please see https://framagit.org/luc/lutim/wikis/memcached to know how to configure your memcached + # Please see https://framagit.org/fiat-tux/hat-softwares/lutim/-/wikis/memcached to know how to configure your memcached # servers. # exemple of valid value: ['127.0.0.1:11211'] # optional, default is [] diff --git a/t/sqlite3.conf b/t/sqlite3.conf index ffc527f..872b8e9 100644 --- a/t/sqlite3.conf +++ b/t/sqlite3.conf @@ -189,7 +189,7 @@ # array of memcached servers to cache URL in order to accelerate responses to often-viewed URL. # If set to [], the use of memcached is disabled. # If you use memcached, the internal cache (see cache_max_size option above) will not be used. - # Please see https://framagit.org/luc/lutim/wikis/memcached to know how to configure your memcached + # Please see https://framagit.org/fiat-tux/hat-softwares/lutim/-/wikis/memcached to know how to configure your memcached # servers. # exemple of valid value: ['127.0.0.1:11211'] # optional, default is [] diff --git a/themes/default/lib/Lutim/I18N/es.po b/themes/default/lib/Lutim/I18N/es.po index c329326..a2f4125 100644 --- a/themes/default/lib/Lutim/I18N/es.po +++ b/themes/default/lib/Lutim/I18N/es.po @@ -179,14 +179,6 @@ msgstr "Exportar datos de almacenamiento local" msgid "File name" msgstr "Nombre de archivo" -#: themes/default/templates/about.html.ep:24 -msgid "" -"For more details, see the homepage of the project." -msgstr "" -"Para más detalles, vea la página " -"del proyecto." - #: themes/default/templates/partial/navbar.html.ep:80 msgid "Fork me!" msgstr "¡Clóname!" diff --git a/themes/default/lib/Lutim/I18N/sv.po b/themes/default/lib/Lutim/I18N/sv.po index e949630..3fdc356 100644 --- a/themes/default/lib/Lutim/I18N/sv.po +++ b/themes/default/lib/Lutim/I18N/sv.po @@ -171,12 +171,6 @@ msgstr "Exportera localStorage-data" msgid "File name" msgstr "Filnamn" -#: themes/default/templates/about.html.ep:24 -msgid "For more details, see the homepage of the project." -msgstr "" -"Se projektets hemsida för mer " -"information." - #: themes/default/templates/partial/navbar.html.ep:66 msgid "Fork me!" msgstr "Grena mig!" diff --git a/themes/default/templates/manifest.webapp.ep b/themes/default/templates/manifest.webapp.ep index 9b1117c..62d952b 100644 --- a/themes/default/templates/manifest.webapp.ep +++ b/themes/default/templates/manifest.webapp.ep @@ -11,8 +11,8 @@ "256": "<%= url_for('/img/lutim256.png') %>" }, "developer": { - "name": "Lutim team !", - "url": "https://framagit.org/luc/lutim" + "name": "Lutim team!", + "url": "https://framagit.org/fiat-tux/hat-softwares/lutim" }, "default_locale": "en", "locales": { diff --git a/themes/default/templates/partial/navbar.html.ep b/themes/default/templates/partial/navbar.html.ep index 7681bc8..2c88b5d 100644 --- a/themes/default/templates/partial/navbar.html.ep +++ b/themes/default/templates/partial/navbar.html.ep @@ -63,7 +63,7 @@ <%= link_to url_for('about') => begin %><%= l('About') %><% end %>
  • - <%= link_to 'https://framagit.org/luc/lutim' => begin %><%= l('Fork me!') %><% end %> + <%= link_to 'https://framagit.org/fiat-tux/hat-softwares/lutim' => begin %><%= l('Fork me!') %><% end %>
    • diff --git a/utilities/Shutter.pm b/utilities/Shutter.pm index 19737ad..c3a9a3a 100755 --- a/utilities/Shutter.pm +++ b/utilities/Shutter.pm @@ -39,7 +39,7 @@ $d->dir( $ENV{'SHUTTER_INTL'} ); my %upload_plugin_info = ( 'module' => "Lutim", - 'url' => "https://lut.im/", + 'url' => "https://lutim.fiat-tux.fr/", 'registration' => "-", 'name' => "Lutim", 'description' => "Upload screenshots to Lutim", @@ -102,7 +102,7 @@ sub upload { #upload the file eval{ - my $url = 'https://lut.im/'; + my $url = 'https://lutim.fiat-tux.fr/'; my $request = HTTP::Request::Common::POST( $url, Content_Type => 'multipart/form-data', diff --git a/utilities/lutim-minion@.service b/utilities/lutim-minion@.service index ddb75e3..598d6b0 100644 --- a/utilities/lutim-minion@.service +++ b/utilities/lutim-minion@.service @@ -1,6 +1,6 @@ [Unit] Description=Image hosting and sharing service job queue -Documentation=https://framagit.org/luc/lutim +Documentation=https://framagit.org/fiat-tux/hat-softwares/lutim After=lutim.service [Service] diff --git a/utilities/lutim.service b/utilities/lutim.service index 4460f53..32532ef 100644 --- a/utilities/lutim.service +++ b/utilities/lutim.service @@ -1,6 +1,6 @@ [Unit] Description=Image hosting and sharing service -Documentation=https://framagit.org/luc/lutim +Documentation=https://framagit.org/fiat-tux/hat-softwares/lutim Requires=network.target After=network.target #Requires=postgresql.service