diff options
-rw-r--r-- | .github/workflows/main.yml | 87 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | release-status.toml | 16 | ||||
-rwxr-xr-x | scripts/list-nightly-builds.py | 2 | ||||
-rw-r--r-- | site/get/index.md | 69 | ||||
-rw-r--r-- | site/get/nightly-builds.md | 18 | ||||
-rw-r--r-- | site/get/stream.md | 61 | ||||
-rw-r--r-- | site/img/footer/sentrium.svg | 64 | ||||
-rw-r--r-- | site/index.html | 4 | ||||
-rw-r--r-- | soupault.toml | 1 | ||||
-rw-r--r-- | templates/main.html | 16 |
11 files changed, 148 insertions, 192 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3aeb133..5dc020e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,6 +9,7 @@ on: branches: - main - production + - amplify schedule: - cron: "0 3 * * *" workflow_dispatch: @@ -17,16 +18,22 @@ on: branch: required: true type: string + aws_amplify_region: + required: true + type: string + aws_amplify_app_id: + required: true + type: string secrets: - NETLIFY_TOKEN: + AWS_AMPLIFY_ACCESS_KEY_ID: required: true - GH_ACCESS_TOKEN: + AWS_AMPLIFY_SECRET_ACCESS_KEY: required: true # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - build: + deploy: environment: name: ${{ github.ref_name }} @@ -35,55 +42,37 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - # If the workflow is called from this repo, check out the branch it's called from - - uses: actions/checkout@v4 - if: ${{ inputs.branch == '' }} - with: - repository: vyos/community.vyos.net - ref: ${{ github.ref_name }} - - # If the workflow is called externally, check out the branch from its inputs - - uses: actions/checkout@v4 - if: ${{ inputs.branch != '' }} - with: - repository: vyos/community.vyos.net - ref: ${{ inputs.branch }} - - - name: Install build dependencies from the repos + - name: Set env variables if they were NOT specified as inputs + if: ${{ inputs.aws_amplify_region == '' || inputs.aws_amplify_app_id == '' }} run: | - echo Installing build dependencies - sudo apt-get update - sudo apt-get -y install cmark make npm - sudo npm install -g sass@1.32.8 - # PyGitHub changes its API recently, distros use older versions, - # so we install it from PyPI for now - python -m venv . - source ./bin/activate - pip install pygithub jinja2 + echo "AWS_AMPLIFY_REGION=${{ vars.AWS_AMPLIFY_REGION }}" >> $GITHUB_ENV + echo "AWS_AMPLIFY_APP_ID=${{ vars.AWS_AMPLIFY_APP_ID }}" >> $GITHUB_ENV + echo "BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV - - name: Install soupault - env: - SOUPAULT_VERSION: 4.10.0 + - name: Set env variables if they were specified as inputs + if: ${{ inputs.aws_amplify_region != '' && inputs.aws_amplify_app_id != '' }} run: | - echo Downloading and unpacking soupault - wget https://github.com/PataphysicalSociety/soupault/releases/download/$SOUPAULT_VERSION/soupault-$SOUPAULT_VERSION-linux-x86_64.tar.gz - tar xvf soupault-$SOUPAULT_VERSION-linux-x86_64.tar.gz - sudo mv -v ./soupault-$SOUPAULT_VERSION-linux-x86_64/soupault /usr/bin/ - - - name: Build the site - env: - GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} - # SOUPAULT_PROFILE is "staging" for the main branch, - # it enabled a preview version warning. - # The "live" profile simply enabled listing nightly builds - SOUPAULT_OPTS: "--profile ${{ vars.SOUPAULT_PROFILE }} --profile live" + echo "AWS_AMPLIFY_REGION=${{ inputs.aws_amplify_region }}" >> $GITHUB_ENV + echo "AWS_AMPLIFY_APP_ID=${{ inputs.aws_amplify_app_id }}" >> $GITHUB_ENV + echo "BRANCH=${{ inputs.branch }}" >> $GITHUB_ENV + + - name: Deploy to Amplify run: | - source ./bin/activate - make all + curl --request POST \ + --url https://amplify.${{ env.AWS_AMPLIFY_REGION }}.amazonaws.com/apps/${{ env.AWS_AMPLIFY_APP_ID }}/branches/${{ env.BRANCH }}/jobs \ + --header 'Content-Type: application/json' \ + --data '{"jobType": "RELEASE"}' \ + --user "${{ secrets.AWS_AMPLIFY_ACCESS_KEY_ID }}:${{ secrets.AWS_AMPLIFY_SECRET_ACCESS_KEY }}" \ + --aws-sigv4 "aws:amz:${{ env.AWS_AMPLIFY_REGION }}:amplify" - - name: Deploy to Netlify + - name: Check Amplify build status + uses: vyos/amplify-build-status@v2.2 + with: + app-id: ${{ env.AWS_AMPLIFY_APP_ID }} + branch-name: ${{ env.BRANCH }} + commit-id: HEAD + wait: true env: - NETLIFY_TOKEN: ${{ secrets.NETLIFY_TOKEN }} - run: | - zip -r website.zip build/ - curl --show-error --fail -H "Content-Type: application/zip" -H "Authorization: Bearer $NETLIFY_TOKEN" --data-binary "@website.zip" https://api.netlify.com/api/v1/sites/${{vars.NETLIFY_SITE_NAME}}/deploys + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_AMPLIFY_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_AMPLIFY_SECRET_ACCESS_KEY }} + AWS_REGION: ${{ env.AWS_AMPLIFY_REGION }} @@ -1,3 +1,5 @@ +[](https://github.com/vyos/community.vyos.net/actions/workflows/main.yml) + # community.vyos.net The VyOS community website. diff --git a/release-status.toml b/release-status.toml index 8b1ff11..225f01d 100644 --- a/release-status.toml +++ b/release-status.toml @@ -1,14 +1,18 @@ [release.sagitta] - latest = "1.4.0" + latest = "1.4.2" security_advisory = [ + {cve="CVE-2025-30095", title="Private key reuse in Dropbear SSH server", description="A Dropbear private key was included in the image at build time and not regenerated, making console server SSH connections vulnerable to MitM attacks..", status="fixed"}, + {cve="CVE-2023-32728", title="Code injection in zabbix_agent2 smartctl plugin", description="Certain configurations of Zabbix agent were vulnerable to remote code execution. This issue was previously fixed by a hotfix and is now included in the image.", status="Fixed"}, + {cve="CVE-2024-3596", title="Blast-RADIUS", description="The Blast-RADIUS vulnerability is present in 1.4.2 and will be fixed in subsequent releases. Make sure your routers are not communicating with RADIUS servers over untrusted networks.", status="Present"} ] - notes = "GA release" + notes = "Maintenance and security release" [release.equuleus] - latest = "1.3.7" + latest = "1.3.8" + + security_advisory = [] + + notes = "Unsupported — VyOS 1.3 has reached end of life in April 2025." - security_advisory = [ - {cve="CVE-2024-2961", title="GNU libc iconv buffer overflow", description="Potential DoS in any application that encodes strings", status="fixed"}, - ] diff --git a/scripts/list-nightly-builds.py b/scripts/list-nightly-builds.py index 6d39a32..eeacd2e 100755 --- a/scripts/list-nightly-builds.py +++ b/scripts/list-nightly-builds.py @@ -15,7 +15,7 @@ import json import github import jinja2 -REPO = 'vyos/vyos-rolling-nightly-builds' +REPO = 'vyos/vyos-nightly-build' def list_images(repo): images = [] diff --git a/site/get/index.md b/site/get/index.md index b150005..f8caa8c 100644 --- a/site/get/index.md +++ b/site/get/index.md @@ -12,7 +12,7 @@ # Get VyOS - VyOS has three release "channels": nightly builds, monthly snapshots, and LTS releases. + VyOS has three release "channels": rolling release, VyOS Stream, and LTS releases. </div> @@ -23,24 +23,36 @@ <div class='content-div'> <div class='nightly-builds'> - ## Nightly builds + ## Rolling release - Nightly builds are automatically produced at least once a day and include all the latest - code (bug fixes and features) from maintainers and community contributors. + Rolling release builds include all latest developments from maintainers and community contributors. + There are no stability guarantees — anything may change, experimental features can be added, + and old features can be removed at any time. They are meant for development and testing. - Nightly builds are not hand-tested before upload. A basic set of automated - [smoke tests](https://github.com/vyos/vyos-1x/tree/current/smoketest/scripts/cli) is executed - for each build ensuring that basic functionality is working. In addition we load arbitrary - [configurations](https://github.com/vyos/vyos-1x/tree/current/smoketest/configs) to ensure - there are no errors during config migration and system bootup. - - Nightly builds are for you if you... + Rolling release builds are for you if you... - want to help us test latest VyOS code - want to check whether a bug is fixed in the latest code - made a patch and want to test it before making a pull request - Go to the [nightly builds page](/get/nightly-builds). + Go to the [rolling release page](/get/nightly-builds) to download. + + </div> + + <div class="lts"> + + ## VyOS Stream + + VyOS Stream serves as a technology preview and a quality gate for the upcoming LTS release. + New images are releases roughly every quarter. + + Features can only be removed from VyOS Stream through a deprecation procedure, + and we promise to only make forward-compatible changes to the configuration syntax + and API, so that users, integrators, and developers of external tools + can prepare their environments and projects for the future LTS release + and help us identify and fix issues. + + Go to the [VyOS Stream page](/get/stream) to download. </div> @@ -53,46 +65,17 @@ There are many ways to get access: - - Purchase a [software access subscription](https://vyos.io/subscriptions/software/). - - Get free access with a [support subscription](https://vyos.io/subscriptions/support/). + - Purchase a [subscription](https://vyos.io/subscriptions/software/). - Apply for a free subscription as a [contributor](/get/contributor-subscriptions). - Apply for a free subscription as an [educational instutution](https://vyos.io/community/for-educational-institutions/), [non-profit](https://vyos.io/community/for-non-commercial-organizations/), or an [emergency service](http://vyos.io/community/for-first-responders/). - Or you can build an LTS image from source. - - </div> - - <div class='legacy-lts'> - - ## Legacy LTS releases - - As a courtesy, we offer images of legacy LTS releases. To access all available legacy LTS releases, kindly complete the form below. Upon submission, you will receive an email containing links to download the images. - - </div> - </div> </section> - <section class='form'> - <div class='containerCustom'> - <div id="application-form" class='application-form'> - -<script charset="utf-8" type="text/javascript" src="//js.hsforms.net/forms/embed/v2.js"></script> -<script> - hbspt.forms.create({ - region: "na1", - portalId: "4129050", - formId: "ebb05a53-23d6-4454-824d-817d0d8b86d4" - }); -</script> - - </div> - </div> - - </section> + <section class="form"> </section> </div> diff --git a/site/get/nightly-builds.md b/site/get/nightly-builds.md index 2a6b860..2554000 100644 --- a/site/get/nightly-builds.md +++ b/site/get/nightly-builds.md @@ -10,7 +10,7 @@ <div class='banner-div'> - # VyOS nightly builds + # VyOS rolling release </div> @@ -20,15 +20,13 @@ <section class='content-section'> <div class='content-div'> <div class='image-signatures'> - - VyOS nightly builds are automatically produced from the `current` branch and the development branch for the LTS release, - at least once a day. + + VyOS rolling release builds are automatically produced from the `current` branch at least once a day. They include all the latest code from maintainers and community contributors. - Nightly builds are not hand-tested before upload. A basic set of automated - [smoke tests](https://github.com/vyos/vyos-1x/tree/current/smoketest/scripts/cli) is executed - for each build ensuring that basic functionality is working. In addition we load arbitrary - [configurations](https://github.com/vyos/vyos-1x/tree/current/smoketest/configs) to ensure + Rolling release builds are not hand-tested before upload. + They undergo a sequence of automated [smoke tests](https://github.com/vyos/vyos-1x/tree/current/smoketest/scripts/cli). + In addition we load arbitrary [configurations](https://github.com/vyos/vyos-1x/tree/current/smoketest/configs) to ensure there are no errors during config migration and system bootup. ## Verifying image signatures @@ -43,11 +41,11 @@ minisign -Vm <ISO file> -P RWSIhkR/dkM2DSaBRniv/bbbAf8hmDqdbOEmgXkf1RxRoxzodgKcDyGq ``` - If in doubt, you can get the public key from the [nightly builds repository](https://github.com/vyos/vyos-rolling-nightly-builds/blob/main/minisign.pub). + If in doubt, you can get the public key from the [nightly builds repository](https://github.com/vyos/vyos-nightly-build/blob/main/minisign.pub). If you are _really_ in doubt (i.e., you have a reason to suspect that the repository and/or this website were compromised), you should report that to the maintainers. - Currently, we create nightly builds with GitHub Actions and store them in releases of the [vyos/vyos-rolling-nightly-builds](https://github.com/vyos/vyos-rolling-nightly-builds/releases) + Currently, we create rolling release builds with GitHub Actions and store them in releases of the [vyos/vyos-nightly-build](https://github.com/vyos/vyos-nightly-build/releases) repository. Here is an auto-generated list of available builds. </div> diff --git a/site/get/stream.md b/site/get/stream.md new file mode 100644 index 0000000..178cc22 --- /dev/null +++ b/site/get/stream.md @@ -0,0 +1,61 @@ +<div class='nightly-builds-page'> + <section class='banner'> + <div class='containerCustom'> + <div class='left-shape'> + <img src='/img/global/shape-left.svg' /> + </div> + <div class='right-shape'> + <img src='/img/global/shape-right.svg' /> + </div> + + <div class='banner-div'> + + # VyOS Stream + + </div> + + </div> + </section> + + <section class='content-section'> + <div class='content-div'> + <div class='image-signatures'> + + VyOS Stream serves as a technology preview and a quality gate for the upcoming LTS release. + New images are releases roughly every quarter. + + Features can only be removed from VyOS Stream through a deprecation procedure, + and we promise to only make forward-compatible changes to the configuration syntax + and API, so that users, integrators, and developers of external tools + can prepare their environments and projects for the future LTS release + and help us identify and fix issues. + + + ## Verifying image signatures + + We use [minisign](https://jedisct1.github.io/minisign/) for release signing. To learn about its advantages + over GPG, read [signify: Securing OpenBSD From Us To You](https://www.openbsd.org/papers/bsdcan-signify.html). + + One obvious advantage is that you don't need to import the key anywhere, you can pass it as a command line argument. + Once you download an image and its `.minisig` file, you can verify its integrity with this command: + + ``` + minisign -Vm <ISO file> -P RWTR1ty93Oyontk6caB9WqmiQC4fgeyd/ejgRxCRGd2MQej7nqebHneP + ``` + + </div> + + <div class='available-builds' id='available-builds'> + + ## Releases + + <h3 id="1.5-2025-Q1">VyOS Stream 1.5-2025-Q1</h3> + + * Image: [vyos-1.5-stream-2025-Q1-generic-amd64.iso](https://community-downloads.vyos.dev/stream/1.5-stream-2025-Q1/vyos-1.5-stream-2025-Q1-generic-amd64.iso) ([sig](https://community-downloads.vyos.dev/stream/1.5-stream-2025-Q1/vyos-1.5-stream-2025-Q1-generic-amd64.iso.minisig)) + * Source code tarball: [circinus-1.5-stream-2025-Q1.tar.gz](https://community-downloads.vyos.dev/stream/1.5-stream-2025-Q1/circinus-1.5-stream-2025-Q1.tar.gz) ([sig](https://community-downloads.vyos.dev/stream/1.5-stream-2025-Q1/circinus-1.5-stream-2025-Q1.tar.gz.minisig)) + + </div> + + </section> + +</div> diff --git a/site/img/footer/sentrium.svg b/site/img/footer/sentrium.svg deleted file mode 100644 index 2078242..0000000 --- a/site/img/footer/sentrium.svg +++ /dev/null @@ -1,64 +0,0 @@ -<svg width="61" height="43" viewBox="0 0 61 43" fill="none" xmlns="http://www.w3.org/2000/svg"> -<path d="M5.26198 24.7957C5.26198 24.422 5.11387 24.1331 4.81764 23.9288C4.5266 23.7196 4.0147 23.5402 3.28192 23.3907C2.55433 23.2413 1.97487 23.0619 1.54351 22.8527C1.11736 22.6434 0.800341 22.3943 0.59246 22.1053C0.389776 21.8164 0.288434 21.4726 0.288434 21.074C0.288434 20.4114 0.579467 19.8509 1.16153 19.3925C1.7488 18.9342 2.49717 18.705 3.40665 18.705C4.3629 18.705 5.13725 18.9417 5.72971 19.415C6.32737 19.8883 6.6262 20.4936 6.6262 21.231H5.17623C5.17623 20.8523 5.00733 20.526 4.66952 20.252C4.33691 19.9779 3.91595 19.8409 3.40665 19.8409C2.88175 19.8409 2.47118 19.9505 2.17495 20.1698C1.87872 20.389 1.73061 20.6754 1.73061 21.0292C1.73061 21.363 1.86833 21.6146 2.14377 21.784C2.41921 21.9534 2.91553 22.1153 3.63272 22.2697C4.3551 22.4242 4.93977 22.6085 5.38671 22.8228C5.83365 23.037 6.16366 23.2961 6.37674 23.6C6.59502 23.8989 6.70415 24.2651 6.70415 24.6986C6.70415 25.421 6.40273 26.0014 5.79987 26.4398C5.19702 26.8733 4.41487 27.09 3.45342 27.09C2.77781 27.09 2.18015 26.9754 1.66045 26.7462C1.14075 26.517 0.73278 26.1982 0.43655 25.7897C0.145516 25.3761 0 24.9302 0 24.4519H1.44217C1.46816 24.9153 1.66045 25.284 2.01904 25.558C2.38283 25.827 2.86096 25.9615 3.45342 25.9615C3.99911 25.9615 4.43565 25.8569 4.76307 25.6477C5.09568 25.4334 5.26198 25.1494 5.26198 24.7957Z" fill="url(#paint0_linear)"/> -<path d="M12.0831 27.09C10.9397 27.09 10.0095 26.7313 9.29227 26.0139C8.57508 25.2914 8.21649 24.3274 8.21649 23.1217V22.8676C8.21649 22.0655 8.37499 21.3505 8.69201 20.7228C9.01423 20.09 9.46117 19.5968 10.0328 19.2431C10.6097 18.8844 11.2334 18.705 11.9038 18.705C13.0003 18.705 13.8527 19.0513 14.4607 19.7438C15.0688 20.4363 15.3728 21.4278 15.3728 22.7181V23.2936H9.65866C9.67945 24.0907 9.92111 24.7359 10.3836 25.2292C10.8514 25.7174 11.4438 25.9615 12.161 25.9615C12.6703 25.9615 13.1017 25.8619 13.4551 25.6626C13.8085 25.4633 14.1177 25.1993 14.3827 24.8704L15.2636 25.5281C14.5568 26.5694 13.4967 27.09 12.0831 27.09ZM11.9038 19.8409C11.3217 19.8409 10.8332 20.0452 10.4382 20.4537C10.0432 20.8573 9.79898 21.4253 9.70543 22.1576H13.9306V22.053C13.889 21.3505 13.6915 20.8075 13.3381 20.4239C12.9847 20.0352 12.5066 19.8409 11.9038 19.8409Z" fill="url(#paint1_linear)"/> -<path d="M18.413 18.8545L18.4598 19.8708C19.1042 19.0936 19.9462 18.705 20.9856 18.705C22.7681 18.705 23.6672 19.6691 23.6828 21.5972V26.9405H22.2406V21.5897C22.2354 21.0068 22.0951 20.5758 21.8197 20.2968C21.5494 20.0178 21.1259 19.8783 20.549 19.8783C20.0813 19.8783 19.6707 19.9979 19.3173 20.237C18.9639 20.4762 18.6885 20.79 18.491 21.1786V26.9405H17.0488V18.8545H18.413Z" fill="url(#paint2_linear)"/> -<path d="M27.8144 16.8965V18.8545H29.3891V19.9231H27.8144V24.9377C27.8144 25.2615 27.8846 25.5057 28.0249 25.6701C28.1652 25.8295 28.4043 25.9092 28.7421 25.9092C28.9084 25.9092 29.1371 25.8793 29.4281 25.8195V26.9405C29.0487 27.0402 28.6797 27.09 28.3211 27.09C27.6767 27.09 27.1908 26.9032 26.8634 26.5295C26.536 26.1558 26.3723 25.6252 26.3723 24.9377V19.9231H24.8365V18.8545H26.3723V16.8965H27.8144Z" fill="url(#paint3_linear)"/> -<path d="M35.1578 20.095C34.9395 20.0602 34.7031 20.0427 34.4484 20.0427C33.5026 20.0427 32.8607 20.4288 32.5229 21.2011V26.9405H31.0808V18.8545H32.484L32.5073 19.7886C32.9803 19.0662 33.6507 18.705 34.5186 18.705C34.7992 18.705 35.0123 18.7399 35.1578 18.8096V20.095Z" fill="url(#paint4_linear)"/> -<path d="M38.0578 26.9405H36.6156V18.8545H38.0578V26.9405ZM36.4987 16.7096C36.4987 16.4854 36.5688 16.2961 36.7091 16.1417C36.8547 15.9872 37.0677 15.91 37.3484 15.91C37.629 15.91 37.8421 15.9872 37.9876 16.1417C38.1331 16.2961 38.2059 16.4854 38.2059 16.7096C38.2059 16.9338 38.1331 17.1207 37.9876 17.2701C37.8421 17.4196 37.629 17.4943 37.3484 17.4943C37.0677 17.4943 36.8547 17.4196 36.7091 17.2701C36.5688 17.1207 36.4987 16.9338 36.4987 16.7096Z" fill="url(#paint5_linear)"/> -<path d="M45.5804 26.1409C45.0192 26.7736 44.1954 27.09 43.1093 27.09C42.2102 27.09 41.5242 26.8409 41.0512 26.3427C40.5835 25.8395 40.347 25.0971 40.3419 24.1156V18.8545H41.784V24.0783C41.784 25.3039 42.3037 25.9167 43.3431 25.9167C44.4449 25.9167 45.1777 25.5231 45.5415 24.7359V18.8545H46.9836V26.9405H45.6116L45.5804 26.1409Z" fill="url(#paint6_linear)"/> -<path d="M50.5384 18.8545L50.5774 19.7513C51.1958 19.0538 52.0299 18.705 53.0797 18.705C54.2595 18.705 55.0624 19.1384 55.4886 20.0053C55.7692 19.6167 56.133 19.3029 56.5799 19.0637C57.0321 18.8246 57.5648 18.705 58.178 18.705C60.0282 18.705 60.9688 19.6441 61 21.5224V26.9405H59.5578V21.6046C59.5578 21.0267 59.4201 20.5957 59.1447 20.3118C58.8692 20.0228 58.4067 19.8783 57.7571 19.8783C57.2218 19.8783 56.7774 20.0327 56.424 20.3416C56.0706 20.6456 55.8653 21.0566 55.8082 21.5747V26.9405H54.3582V21.642C54.3582 20.4662 53.758 19.8783 52.5574 19.8783C51.6116 19.8783 50.9646 20.2644 50.6164 21.0367V26.9405H49.1742V18.8545H50.5384Z" fill="url(#paint7_linear)"/> -<path d="M40.6667 5.16H47.156V14.62H52.3475V0H40.6667V5.16Z" fill="url(#paint8_linear)"/> -<path d="M35.9078 0H9.08511V14.62H14.2766V5.16H35.9078V0Z" fill="url(#paint9_linear)"/> -<path d="M14.2766 31.39H9.08511V43H20.766V37.84H14.2766V31.39Z" fill="url(#paint10_linear)"/> -<path d="M25.5248 37.84V43H52.3475V31.39H47.156V37.84H25.5248Z" fill="url(#paint11_linear)"/> -<defs> -<linearGradient id="paint0_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint1_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint2_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint3_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint4_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint5_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint6_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint7_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint8_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint9_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint10_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -<linearGradient id="paint11_linear" x1="9.08511" y1="-9.61125e-07" x2="52.0843" y2="43.2616" gradientUnits="userSpaceOnUse"> -<stop stop-color="#22C49D"/> -<stop offset="1" stop-color="#11AEBD"/> -</linearGradient> -</defs> -</svg>
\ No newline at end of file diff --git a/site/index.html b/site/index.html index 5a56a71..fa421b0 100644 --- a/site/index.html +++ b/site/index.html @@ -15,7 +15,7 @@ </div> </div> <div class="content"> - <p>VyOS is fully open-source and we encourage everyone to build images and report any build process issues. The source code of the rolling release and LTS branches alike is available online. However, simply making code available is not enough.</p> + <p>VyOS is fully open-source and we encourage everyone to build images and report any build process issues. However, simply making code available is not enough.</p> <p>We also keep the complete build toolchain available, and we strive to make it easy to use. You can build a VyOS image in just a few commands. There is no special maintainer toolchain we keep to ourselves: all image build tools are available to everyone interested.</p> </div> <a href="https://docs.vyos.io/en/latest/contributing/build-vyos.html">Learn how to build a VyOS image</a> @@ -71,4 +71,4 @@ <h2>Funding model</h2> <p>VyOS is funded through cloud marketplace images, prebuilt LTS image subscriptions, and support/consulting services.</p> </div> -</section>
\ No newline at end of file +</section> diff --git a/soupault.toml b/soupault.toml index 14622c2..fdab78e 100644 --- a/soupault.toml +++ b/soupault.toml @@ -95,7 +95,6 @@ Disallow: / widget = "insert_html" html = """ <div id="rolling-current"> - <h3>Current/Circinus (future 1.5.0)</h3> </div> """ selector = "#available-builds" diff --git a/templates/main.html b/templates/main.html index bbef798..9564682 100644 --- a/templates/main.html +++ b/templates/main.html @@ -130,22 +130,6 @@ <div class="containerCustom"> <div class="inner"> <div class="top"> - <div class="sentrium-column"> - <div> - <img - src="/img/footer/sentrium.svg" - alt="VyOS Community" - title="VyOS Community" - /> - - <p>Digital transformation of your business with Sentrium</p> - </div> - <a - href="https://sentrium.io/" - target="_blank" - >Visit Sentrium</a - > - </div> <div class="links-columns"> <div class="links-column"> <h3>Get VyOS</h3> |