]> git.ipfire.org Git - ipfire.org.git/blobdiff - Makefile.am
projects / ipfire.org.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update font-awesome to 5.11.2
[ipfire.org.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 4f147c576c089e39179f3ff50778e95aba6633b6..d51e3c6b1c4796ead72df60a6686846319e25abf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = color-tests
 # keep itermediate files
 .SECONDARY:
 
-pythondir  = $(pyexecdir)
+pythondir  = $(prefix)/lib/python3/dist-packages
 
 configsdir = $(sysconfdir)/ipfire.org
 crondir    = $(sysconfdir)/cron.d
@@ -64,6 +64,7 @@ backend_PYTHON = \
        src/backend/misc.py \
        src/backend/netboot.py \
        src/backend/nopaste.py \
+       src/backend/ratelimit.py \
        src/backend/releases.py \
        src/backend/settings.py \
        src/backend/talk.py \
@@ -110,12 +111,19 @@ templatesdir = $(datadir)/templates
 
 templates_auth_DATA = \
        src/templates/auth/activate.html \
+       src/templates/auth/activated.html \
        src/templates/auth/login.html \
        src/templates/auth/register.html \
+       src/templates/auth/register-spam.html \
        src/templates/auth/register-success.html
 
 templates_authdir = $(templatesdir)/auth
 
+templates_auth_messages_DATA = \
+       src/templates/auth/messages/register.txt
+
+templates_auth_messagesdir = $(templates_authdir)/messages
+
 templates_blog_DATA = \
        src/templates/blog/author.html \
        src/templates/blog/base.html \
@@ -229,8 +237,14 @@ templates_people_DATA = \
 
 templates_peopledir = $(templatesdir)/people
 
+templates_people_messages_DATA = \
+       src/templates/people/messages/new-account.txt
+
+templates_people_messagesdir = $(templates_peopledir)/messages
+
 templates_people_modules_DATA = \
        src/templates/people/modules/accounts-list.html \
+       src/templates/people/modules/accounts-new.html \
        src/templates/people/modules/cdr.html \
        src/templates/people/modules/channels.html \
        src/templates/people/modules/mos.html \
@@ -262,12 +276,15 @@ templates_staticdir = $(templatesdir)/static
 templates_wiki_DATA = \
        src/templates/wiki/404.html \
        src/templates/wiki/base.html \
+       src/templates/wiki/confirm-delete.html \
+       src/templates/wiki/confirm-restore.html \
        src/templates/wiki/diff.html \
        src/templates/wiki/edit.html \
        src/templates/wiki/page.html \
        src/templates/wiki/recent-changes.html \
        src/templates/wiki/revisions.html \
-       src/templates/wiki/search-results.html
+       src/templates/wiki/search-results.html \
+       src/templates/wiki/watchlist.html
 
 templates_wikidir = $(templatesdir)/wiki
 
@@ -293,6 +310,7 @@ templates_wiki_modulesdir = $(templates_wikidir)/modules
 
 SCSS_FILES = \
        src/scss/style.scss \
+       src/scss/_code-highlighting.scss \
        src/scss/_fonts.scss \
        src/scss/_icons.scss \
        src/scss/_variables.scss
@@ -859,21 +877,21 @@ static_fonts_DATA = \
        src/fonts/ofl/mukta/Mukta-Regular.ttf \
        src/fonts/ofl/mukta/Mukta-SemiBold.ttf \
        \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.eot \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.svg \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.ttf \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.woff \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.woff2 \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.eot \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.svg \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.ttf \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.woff \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.woff2 \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.eot \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.svg \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.ttf \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.woff \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.woff2 \
+       src/font-awesome/webfonts/fa-brands-400.eot \
+       src/font-awesome/webfonts/fa-brands-400.svg \
+       src/font-awesome/webfonts/fa-brands-400.ttf \
+       src/font-awesome/webfonts/fa-brands-400.woff \
+       src/font-awesome/webfonts/fa-brands-400.woff2 \
+       src/font-awesome/webfonts/fa-regular-400.eot \
+       src/font-awesome/webfonts/fa-regular-400.svg \
+       src/font-awesome/webfonts/fa-regular-400.ttf \
+       src/font-awesome/webfonts/fa-regular-400.woff \
+       src/font-awesome/webfonts/fa-regular-400.woff2 \
+       src/font-awesome/webfonts/fa-solid-900.eot \
+       src/font-awesome/webfonts/fa-solid-900.svg \
+       src/font-awesome/webfonts/fa-solid-900.ttf \
+       src/font-awesome/webfonts/fa-solid-900.woff \
+       src/font-awesome/webfonts/fa-solid-900.woff2 \
        \
        src/payment-font/fonts/paymentfont-webfont.eot \
        src/payment-font/fonts/paymentfont-webfont.svg \
@@ -915,8 +933,10 @@ static_js_DATA = \
        src/bootstrap/dist/js/bootstrap.min.js \
        src/bootstrap/dist/js/bootstrap.min.js.map \
        \
+       src/static/js/editor.js \
        src/static/js/jquery-3.3.1.min.js \
        src/static/js/popper.min.js \
+       src/static/js/popper.min.js.map \
        src/static/js/prettify.js \
        \
        src/static/js/zxcvbn/dist/zxcvbn.js \
@@ -937,7 +957,7 @@ static_netbootdir = $(staticdir)/netboot
 # ------------------------------------------------------------------------------
 
 dist_cron_DATA = \
-       src/crontab/ipfire.org
+       src/crontab/ipfire
 
 # ------------------------------------------------------------------------------
 
@@ -999,7 +1019,13 @@ src/static/favicon.ico: src/static/img/ipfire-tux.png Makefile
 src/static/img/apple-touch-icon-%-precomposed.png: src/static/img/ipfire-tux.png Makefile
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(CONVERT) -background none -flatten -density 1200 -bordercolor none -border 5%x5% \
-               -resize $(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@) $< $@
+               -resize $(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@) -gravity center \
+               -extent $(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@)x$(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@) \
+               $< $@
+
+.PHONY: update
+update:
+       for i in src/systemd/ipfire.org-webapp-*.service; do systemctl restart $$(basename $${i}) && sleep 5; done
 
 # Docker
 .PHONY: docker
The website of ipfire.org.