X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=be16ecf8274d46eee26c323568efbc1c4929bb2b;hb=refs%2Fheads%2Fcommunity;hp=3b29eb03754e6b2d581a05706ffacf5b639e8580;hpb=58f9e4139f8fd434ccc678d435149ce3ef45525f;p=ipfire.org.git diff --git a/Makefile.am b/Makefile.am index 3b29eb03..be16ecf8 100644 --- 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,8 +111,10 @@ 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 @@ -178,6 +181,8 @@ templates_fireinfo_modulesdir = $(templates_fireinfodir)/modules templates_location_DATA = \ src/templates/location/base.html \ src/templates/location/blacklists.html \ + src/templates/location/how-to-use.html \ + src/templates/location/index.html \ src/templates/location/lookup.html templates_locationdir = $(templatesdir)/location @@ -234,8 +239,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 \ @@ -257,7 +268,6 @@ templates_people_ssh_keysdir = $(templates_peopledir)/ssh-keys templates_static_DATA = \ src/templates/static/blocked.html \ - src/templates/static/chat.html \ src/templates/static/features.html \ src/templates/static/legal.html \ src/templates/static/support.html @@ -267,6 +277,8 @@ 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 \ @@ -299,6 +311,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 @@ -865,21 +878,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 \ @@ -897,10 +910,12 @@ static_images_DATA = \ src/static/img/apple-touch-icon-76x76-precomposed.png \ src/static/img/apple-touch-icon-72x72-precomposed.png \ src/static/img/apple-touch-icon-60x60-precomposed.png \ + src/static/img/bash-logo.svg \ src/static/img/default-avatar.jpg \ src/static/img/ipfire-tux.png \ src/static/img/iuse-not-found.png \ - src/static/img/lightningwirelabs-logo.svg + src/static/img/lightningwirelabs-logo.svg \ + src/static/img/python-logo.svg static_imagesdir = $(staticdir)/img @@ -921,6 +936,7 @@ 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 \ @@ -944,7 +960,7 @@ static_netbootdir = $(staticdir)/netboot # ------------------------------------------------------------------------------ dist_cron_DATA = \ - src/crontab/ipfire.org + src/crontab/ipfire # ------------------------------------------------------------------------------ @@ -1006,7 +1022,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