X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=a5f6e265a978b187e678725c9e60fefe664de4dc;hb=ba14044cfeb974f12417d6f534aa622f4a3890f3;hp=a5db487be9fa4e03e8a46797f556c247bf5c2e22;hpb=2f23c5584b25886f9667db05f0c94d1c96c1658a;p=ipfire.org.git diff --git a/Makefile.am b/Makefile.am index a5db487b..a5f6e265 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 @@ -51,6 +51,7 @@ backend_PYTHON = \ src/backend/accounts.py \ src/backend/base.py \ src/backend/blog.py \ + src/backend/campaigns.py \ src/backend/countries.py \ src/backend/database.py \ src/backend/decorators.py \ @@ -64,6 +65,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 \ @@ -89,7 +91,6 @@ web_PYTHON = \ src/web/iuse.py \ src/web/location.py \ src/web/mirrors.py \ - src/web/newsletter.py \ src/web/nopaste.py \ src/web/people.py \ src/web/ui_modules.py \ @@ -110,13 +111,27 @@ templatesdir = $(datadir)/templates templates_auth_DATA = \ src/templates/auth/activate.html \ + src/templates/auth/activated.html \ src/templates/auth/login.html \ + src/templates/auth/password-reset.html \ + src/templates/auth/password-reset-initiation.html \ + src/templates/auth/password-reset-successful.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/donation-reminder.html \ + src/templates/auth/messages/donation-reminder.txt \ + src/templates/auth/messages/password-reset.html \ + src/templates/auth/messages/password-reset.txt \ + src/templates/auth/messages/profile-setup.html \ + src/templates/auth/messages/profile-setup.txt \ + src/templates/auth/messages/profile-setup-2.html \ + src/templates/auth/messages/profile-setup-2.txt \ + src/templates/auth/messages/register.html \ src/templates/auth/messages/register.txt templates_auth_messagesdir = $(templates_authdir)/messages @@ -137,6 +152,12 @@ templates_blog_DATA = \ templates_blogdir = $(templatesdir)/blog +templates_blog_messages_DATA = \ + src/templates/blog/messages/announcement.html \ + src/templates/blog/messages/announcement.txt + +templates_blog_messagesdir = $(templates_blogdir)/messages + templates_blog_modules_DATA = \ src/templates/blog/modules/history-navigation.html \ src/templates/blog/modules/list.html \ @@ -152,6 +173,24 @@ templates_donate_DATA = \ templates_donatedir = $(templatesdir)/donate +templates_donate_messages_DATA = \ + src/templates/donate/messages/ask-again.html \ + src/templates/donate/messages/ask-again.txt \ + src/templates/donate/messages/christmas-1.html \ + src/templates/donate/messages/christmas-1.txt \ + src/templates/donate/messages/christmas-2.html \ + src/templates/donate/messages/christmas-2.txt \ + src/templates/donate/messages/christmas-3.html \ + src/templates/donate/messages/christmas-3.txt \ + src/templates/donate/messages/christmas-4.html \ + src/templates/donate/messages/christmas-4.txt \ + src/templates/donate/messages/christmas-5.html \ + src/templates/donate/messages/christmas-5.txt \ + src/templates/donate/messages/convert-to-monthly.html \ + src/templates/donate/messages/convert-to-monthly.txt + +templates_donate_messagesdir = $(templates_donatedir)/messages + templates_download_DATA = \ src/templates/download/release.html @@ -178,10 +217,19 @@ 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 +templates_messages_DATA = \ + src/templates/messages/base.html \ + src/templates/messages/base-promo.html \ + src/templates/messages/main.css + +templates_messagesdir = $(templatesdir)/messages + templates_mirrors_DATA = \ src/templates/mirrors/index.html \ src/templates/mirrors/mirror.html @@ -189,6 +237,7 @@ templates_mirrors_DATA = \ templates_mirrorsdir = $(templatesdir)/mirrors templates_modules_DATA = \ + src/templates/modules/christmas-banner.html \ src/templates/modules/map.html \ src/templates/modules/progress-bar.html @@ -203,11 +252,6 @@ templates_netboot_DATA = \ templates_netbootdir = $(templatesdir)/netboot -templates_newsletter_DATA = \ - src/templates/newsletter/subscribed.html - -templates_newsletterdir = $(templatesdir)/newsletter - templates_nopaste_DATA = \ src/templates/nopaste/create.html \ src/templates/nopaste/view.html @@ -224,18 +268,31 @@ templates_people_DATA = \ src/templates/people/conferences.html \ src/templates/people/call.html \ src/templates/people/calls.html \ + src/templates/people/group.html \ + src/templates/people/groups.html \ src/templates/people/index.html \ src/templates/people/passwd.html \ src/templates/people/search.html \ src/templates/people/sip.html \ + src/templates/people/stats.html \ + src/templates/people/subscribed.html \ + src/templates/people/unsubscribe.html \ + src/templates/people/unsubscribed.html \ src/templates/people/user.html \ src/templates/people/user-edit.html \ src/templates/people/users.html 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/agent.html \ src/templates/people/modules/cdr.html \ src/templates/people/modules/channels.html \ src/templates/people/modules/mos.html \ @@ -246,18 +303,8 @@ templates_people_modules_DATA = \ templates_people_modulesdir = $(templates_peopledir)/modules -templates_people_ssh_keys_DATA = \ - src/templates/people/ssh-keys/delete.html \ - src/templates/people/ssh-keys/error.html \ - src/templates/people/ssh-keys/error-invalid-key.html \ - src/templates/people/ssh-keys/index.html \ - src/templates/people/ssh-keys/upload.html - -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 +314,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 +348,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 +915,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 +947,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,8 +973,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 \ @@ -943,7 +997,7 @@ static_netbootdir = $(staticdir)/netboot # ------------------------------------------------------------------------------ dist_cron_DATA = \ - src/crontab/ipfire.org + src/crontab/ipfire # ------------------------------------------------------------------------------ @@ -1005,7 +1059,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