From ea2600c3e8d9530feb6750070267c0c74bcf845e Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 28 Sep 2019 10:56:40 -0500 Subject: [PATCH 1/2] mason.config: Update status url to https. --- extra/mason/config/config.factor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/mason/config/config.factor b/extra/mason/config/config.factor index 04adaaf0e9..ba6c934bcd 100644 --- a/extra/mason/config/config.factor +++ b/extra/mason/config/config.factor @@ -38,12 +38,12 @@ SYMBOL: builder-debug ! URL for counter notifications. SYMBOL: counter-url -counter-url [ "http://builds.factorcode.org/counter" ] initialize +counter-url [ "https://builds.factorcode.org/counter" ] initialize ! URL for status notifications. SYMBOL: status-url -status-url [ "http://builds.factorcode.org/status-update" ] initialize +status-url [ "https://builds.factorcode.org/status-update" ] initialize ! Password for status notifications. SYMBOL: status-secret @@ -64,7 +64,7 @@ SYMBOL: docs-directory ! URL to notify server about new docs SYMBOL: docs-update-url -docs-update-url [ "http://builds.factorcode.org/docs-update" ] initialize +docs-update-url [ "https://builds.factorcode.org/docs-update" ] initialize ! Boolean. Do we upload package binaries? SYMBOL: upload-package? From 1935533b08758d8bbe9f13a9c46dde5653b728d9 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 28 Sep 2019 16:55:22 +0000 Subject: [PATCH 2/2] webapps: Update to https --- .../mason/backend/watchdog/watchdog.factor | 2 +- extra/webapps/mason/utils/utils-tests.factor | 2 +- extra/webapps/mason/utils/utils.factor | 8 ++--- extra/websites/factorcode/index.fhtml | 36 +++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/extra/webapps/mason/backend/watchdog/watchdog.factor b/extra/webapps/mason/backend/watchdog/watchdog.factor index 3fbd898b92..f3a464370d 100644 --- a/extra/webapps/mason/backend/watchdog/watchdog.factor +++ b/extra/webapps/mason/backend/watchdog/watchdog.factor @@ -12,7 +12,7 @@ IN: webapps.mason.backend.watchdog

Machines which are not sending heartbeats:

- Dashboard + Dashboard XML> xml>string diff --git a/extra/webapps/mason/utils/utils-tests.factor b/extra/webapps/mason/utils/utils-tests.factor index 3912720cb6..80b3214a23 100644 --- a/extra/webapps/mason/utils/utils-tests.factor +++ b/extra/webapps/mason/utils/utils-tests.factor @@ -4,7 +4,7 @@ IN: webapps.mason.utils.tests { - "http://builds.factorcode.org/report?os=the-os&cpu=the-cpu" + "https://builds.factorcode.org/report?os=the-os&cpu=the-cpu" } [ URL" /" url set builder new "the-os" >>os "the-cpu" >>cpu report-url diff --git a/extra/webapps/mason/utils/utils.factor b/extra/webapps/mason/utils/utils.factor index 6504b5f262..8dc629cf32 100644 --- a/extra/webapps/mason/utils/utils.factor +++ b/extra/webapps/mason/utils/utils.factor @@ -38,7 +38,7 @@ IN: webapps.mason.utils 2array sift [ [XML
  • <->
    • XML] ] map [XML XML] ; : download-url ( string -- string' ) - "http://downloads.factorcode.org/" prepend ; + "https://downloads.factorcode.org/" prepend ; : platform-url ( url builder -- url ) [ os>> "os" set-query-param ] @@ -46,15 +46,15 @@ IN: webapps.mason.utils adjust-url ; : package-url ( builder -- url ) - [ URL" http://builds.factorcode.org/package" clone ] dip + [ URL" https://builds.factorcode.org/package" clone ] dip platform-url ; : report-url ( builder -- url ) - [ URL" http://builds.factorcode.org/report" clone ] dip + [ URL" https://builds.factorcode.org/report" clone ] dip platform-url ; : release-url ( builder -- url ) - [ URL" http://builds.factorcode.org/release" clone ] dip + [ URL" https://builds.factorcode.org/release" clone ] dip platform-url ; : validate-secret ( -- ) diff --git a/extra/websites/factorcode/index.fhtml b/extra/websites/factorcode/index.fhtml index 08537e7a17..acb13ce1df 100644 --- a/extra/websites/factorcode/index.fhtml +++ b/extra/websites/factorcode/index.fhtml @@ -26,26 +26,26 @@ xml.writer xmode.highlight ; %>

    Why Factor?

    -

    The Factor programming language combines powerful language features with a full-featured library. The implementation is fully compiled for performance, while still supporting interactive development. Factor applications are portable between all common platforms. Factor can deploy stand-alone applications on all platforms. Full source code for the Factor project is available under a BSD license.

    +

    The Factor programming language combines powerful language features with a full-featured library. The implementation is fully compiled for performance, while still supporting interactive development. Factor applications are portable between all common platforms. Factor can deploy stand-alone applications on all platforms. Full source code for the Factor project is available under a BSD license.

    -

    Most of the above links point to pages on the concatenative.org wiki.

    +

    Most of the above links point to pages on the concatenative.org wiki.

    Show me some code!

    -

    Factor belongs to the family of concatenative languages: this means that, at the lowest level, a Factor program is a series of words (functions) that manipulate a stack of references to dynamically-typed values. This gives the language a powerful foundation which allows many abstractions and paradigms to be built on top. Reload this page to see a random code example below.

    +

    Factor belongs to the family of concatenative languages: this means that, at the lowest level, a Factor program is a series of words (functions) that manipulate a stack of references to dynamically-typed values. This gives the language a powerful foundation which allows many abstractions and paradigms to be built on top. Reload this page to see a random code example below.

    <%
 "resource:extra/websites/factorcode/examples.txt" utf8 file-lines
@@ -54,7 +54,7 @@ xml.writer xmode.highlight ; %>
 xml>string write-html
 %>
    -

    See the example programs page on the wiki for more.

    +

    See the example programs page on the wiki for more.

    @@ -83,18 +83,18 @@ xml>string write-html <% ] with-mason-db %> -

    Stable and development releases are built and uploaded by the build farm. Follow @FactorBuilds on Twitter to receive notifications. If you're curious, take a look at the build farm dashboard.

    +

    Stable and development releases are built and uploaded by the build farm. Follow @FactorBuilds on Twitter to receive notifications. If you're curious, take a look at the build farm dashboard.

    -

    Source code is stored in our GIT repository. Source can can be browsed online via github or gitweb.

    +

    Source code is stored in our GIT repository. Source can can be browsed online via github or gitweb.

    More