diff --git a/_config.yml b/_config.yml index 1127e0d..3ca1977 100644 --- a/_config.yml +++ b/_config.yml @@ -53,6 +53,7 @@ glasswire_comparison_url: /blog/2022/08/17/portmaster-vs-glasswire/ ### external docs_url: https://docs.safing.io/ +wiki_url: https://wiki.safing.io/ account_server_url: https://account.safing.io/ account_server_redeem_url: https://account.safing.io/redeem diff --git a/docker-compose.yml b/docker-compose.yml index e5bdb3c..b3dff66 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,12 @@ # to start the server just run # docker-compose up -jekyll: - image: jekyll/jekyll:3 - command: jekyll serve --watch --incremental --livereload --future - ports: - - 4000:4000 - - 35729:35729 - volumes: - - .:/srv/jekyll + +services: + jekyll: + image: jekyll/jekyll:3 + command: jekyll serve --watch --incremental --livereload --future + ports: + - 4000:4000 + - 35729:35729 + volumes: + - .:/srv/jekyll diff --git a/support/index.html b/support/index.html index 912b32a..ff86822 100644 --- a/support/index.html +++ b/support/index.html @@ -6,47 +6,55 @@ layout: page <section class="general-layout"> <div class="download-container"> - <h1 class="download-container-title">Support</h1> + <h1 class="download-container-title">Help Yourself</h1> <p class="download-container-extra"> - What do you need help with? + Chances are, someone else had the same problem. </p> <div class="col-container-center w-full md:w-max text-center md:text-left"> - <a class="btn-secondary" href="#portmaster">Portmaster</a> - <a class="btn-secondary" href="#spn">SPN</a> + <a class="btn-secondary" href="{{ site.docs_url }}"> + Docs & FAQ + </a> + <a class="btn-secondary" href="{{ site.wiki_url }}"> + Wiki + </a> + <a class="btn-secondary" href="https://github.com/issues?q=is%3Aopen+is%3Aissue+user%3Asafing+sort%3Aupdated-desc"> + GitHub Issues + </a> + </div> + </div> + <div class="download-container"> + <h1 class="download-container-title">Get Help from the Community</h1> + <p class="download-container-extra"> + Ask other Portmaster users for help. + </p> + <div class="col-container-center w-full md:w-max text-center md:text-left"> + <a class="btn-secondary" href="{{ site.discord_url }}"> + Discord + </a> + <a class="btn-secondary" href="{{ site.reddit_url }}"> + Reddit + </a> + <a class="btn-secondary" href="https://github.com/safing/portmaster/issues/new/choose"> + GitHub Issue + </a> + </div> + </div> + <div class="download-container"> + <h1 class="download-container-title">Direct Support for Paying Customers</h1> + <p class="download-container-extra"> + Contact us directly. + </p> + <div class="col-container-center w-full md:w-max text-center md:text-left"> + <a class="btn-secondary" href="mailto:support@safing.io"> + Email + </a> </div> </div> <div class="space-y-36" id="portmaster"> - <div class="download-container"> - <h2 class="download-container-title"> - Portmaster - </h2> - <div class="space-y-8 max-w-3xl mx-auto"> - <p class="download-container-extra"> - For common problems check out our documentation with extensive guides on - installation, DNS Configuration and the Settings Handbook, describing every - Portmaster setting in detail. Report issues and bugs on GitHub while you can - always ask for more help on our subreddit or via mail. - </p> - </div> - <div class="col-container-center w-full md:w-max text-center md:text-left"> - <a class="btn-secondary" href="{{ site.docs_url }}"> - View Documentation - </a> - <a href="{{ site.docs_url }}portmaster/guides/contribute#report-bugs-suggest-features-and-improvements" class="btn-secondary""> - Report Issue - </a> - <a class="btn-secondary" href="{{ site.reddit_url }}"> - Ask On Reddit - </a> - <a class="btn-secondary" href="mailto:support@safing.io"> - Contact us - </a> - </div> - </div> <div class="faq-container"> <div class="faq-container-top"> <h2 class="faq-container-top-title"> - FAQ + Portmaster FAQ </h2> <p class="faq-container-top-desc"> Have a question? Check out some we already answered below. You can always reach out to us to find out more or just to say hi. @@ -86,26 +94,10 @@ layout: page </div> </div> <div class="space-y-36" id="spn"> - <div class="download-container"> - <h2 class="download-container-title"> - Safing Privacy Network - </h2> - <div class="col-container-center w-full md:w-max text-center md:text-left"> - <a class="btn-secondary" href="{{ site.github_url }}/spn"> - View SPN Repository - </a> - <a class="btn-secondary" href="{{ site.reddit_url }}"> - Ask on Reddit - </a> - <a class="btn-secondary" href="mailto:support@safing.io"> - Contact us - </a> - </div> - </div> <div class="faq-container"> <div class="faq-container-top"> <h2 class="faq-container-top-title"> - FAQ + SPN FAQ </h2> <p class="faq-container-top-desc"> Have a question? Check out some we already answered below. You can always reach out to us to find out more or just to say hi.