Merge pull request #48 from cal0pteryx/master

Build via Github Actions, update styles, fix broken URLs
xsf · Oct 20, 2023 · f76c4e0 · f76c4e0
2 parents e23a6d6 + 99f26aa
commit f76c4e0
Show file tree

Hide file tree

Showing 34 changed files with 177 additions and 153 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -0,0 +1,29 @@
+name: Build Registry Files
+
+on:
+  push:
+    branches:
+    - master
+
+  # Allows to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      ARCHIVE: xsf-registrar-master.tar.gz
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Install xmllint and xslt utilities
+        run: sudo apt-get install -y libxml2-utils xsltproc
+      - name: Build files
+        run: make all
+      - name: Create build archive
+        run: tar -czf ${{ env.ARCHIVE }} "./registrar"
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: xsf-registrar-master
+          path: ${{ env.ARCHIVE }}
diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -0,0 +1,20 @@
+name: Validate Registry Files
+
+on:
+  pull_request:
+    branches:
+    - master
+
+  # Allows to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Install xmllint
+        run: sudo apt-get install -y libxml2-utils
+      - name: Validate
+        run: make validate
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile b/Dockerfile
@@ -11,5 +11,4 @@ RUN cd /usr/local/src/registrar && make all
 
 FROM nginx:alpine
 COPY deploy/registrar.conf /etc/nginx/conf.d/default.conf
-COPY --from=0 /usr/local/src/registrar/index.html /var/www/registrar/index.html
 COPY --from=0 /usr/local/src/registrar/registrar /var/www/registrar/
diff --git a/Makefile b/Makefile
@@ -13,6 +13,8 @@ xml = ${srcs:./%.xml=$(OUTDIR)/%.xml}
 all: validate build
 
 build: $(html) $(xml)
+	cp *.html "$(OUTDIR)"
+
 
 validate:
 	for srcfile in $(srcs); do \

diff --git a/README.md b/README.md
@@ -0,0 +1,31 @@
+# XSF Registrar
+
+[xmpp.org/registrar](https://xmpp.org/registrar/)
+
+## Building
+
+### Make
+
+Validate using:
+
+```shell
+make validate
+```
+
+Build using:
+
+```shell
+make build
+```
+
+### Docker
+
+```shell
+sudo docker build -t xmppxsf/registrar .
+```
+
+```shell
+sudo docker run -p 80:80 -t -i xmppxsf/registrar
+```
+
+View at [localhost/registrar/](http://localhost/registrar/)
diff --git a/alt-connections.xsl b/alt-connections.xsl
@@ -10,15 +10,15 @@
         <meta name="url" content="{$OUTPUT_FILENAME}"/>
         <meta name="save_as" content="{$OUTPUT_FILENAME}"/>
         <title><xsl:value-of select='/registry/meta/title'/></title>
-        <link rel='stylesheet' type='text/css' href='/xmpp.css' />
-        <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+        <link rel='stylesheet' type='text/css' href='https://xmpp.org/xmpp.css' />
+        <link rel='shortcut icon' type='image/x-icon' href='https://xmpp.org/favicon.ico' />
       </head>
       <body bgcolor='#FFFFFF'>
         <h2><xsl:value-of select='/registry/meta/title'/></h2>
         <xsl:apply-templates select='/registry/meta/overview'/>
         <!--<p><xsl:value-of select='/registry/meta/legal'/></p>-->
         <p>Last Updated: <xsl:value-of select='/registry/meta/revision/date'/></p>
-        <p>XML: <a href='http://xmpp.org/registrar/alt-connections.xml'>http://xmpp.org/registrar/alt-connections.xml</a></p>
+        <p>XML: <a href='https://xmpp.org/registrar/alt-connections.xml'>https://xmpp.org/registrar/alt-connections.xml</a></p>
         <hr />
         <table border='1' cellpadding='3' cellspacing='0'>
           <tr class='body'>

diff --git a/amp-actions.xsl b/amp-actions.xsl
@@ -10,15 +10,15 @@
         <meta name="url" content="{$OUTPUT_FILENAME}"/>
         <meta name="save_as" content="{$OUTPUT_FILENAME}"/>
         <title><xsl:value-of select='/registry/meta/title'/></title>
-        <link rel='stylesheet' type='text/css' href='/xmpp.css' />
-        <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+        <link rel='stylesheet' type='text/css' href='https://xmpp.org/xmpp.css' />
+        <link rel='shortcut icon' type='image/x-icon' href='https://xmpp.org/favicon.ico' />
       </head>
       <body bgcolor='#FFFFFF'>
         <h2><xsl:value-of select='/registry/meta/title'/></h2>
         <xsl:apply-templates select='/registry/meta/overview'/>
         <!--<p><xsl:value-of select='/registry/meta/legal'/></p>-->
         <p>Last Updated: <xsl:value-of select='/registry/meta/revision/date'/></p>
-        <p>XML: <a href='http://xmpp.org/registrar/amp-actions.xml'>http://xmpp.org/registrar/amp-actions.xml</a></p>
+        <p>XML: <a href='https://xmpp.org/registrar/amp-actions.xml'>https://xmpp.org/registrar/amp-actions.xml</a></p>
         <hr />
         <xsl:call-template name='processTOC' />
         <hr />

diff --git a/amp-conditions.xsl b/amp-conditions.xsl
@@ -10,15 +10,15 @@
         <meta name="url" content="{$OUTPUT_FILENAME}"/>
         <meta name="save_as" content="{$OUTPUT_FILENAME}"/>
         <title><xsl:value-of select='/registry/meta/title'/></title>
-        <link rel='stylesheet' type='text/css' href='/xmpp.css' />
-        <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+        <link rel='stylesheet' type='text/css' href='https://xmpp.org/xmpp.css' />
+        <link rel='shortcut icon' type='image/x-icon' href='https://xmpp.org/favicon.ico' />
       </head>
       <body bgcolor='#FFFFFF'>
         <h2><xsl:value-of select='/registry/meta/title'/></h2>
         <xsl:apply-templates select='/registry/meta/overview'/>
         <!--<p><xsl:value-of select='/registry/meta/legal'/></p>-->
         <p>Last Updated: <xsl:value-of select='/registry/meta/revision/date'/></p>
-        <p>XML: <a href='http://xmpp.org/registrar/amp-conditions.xml'>http://xmpp.org/registrar/amp-conditions.xml</a></p>
+        <p>XML: <a href='https://xmpp.org/registrar/amp-conditions.xml'>https://xmpp.org/registrar/amp-conditions.xml</a></p>
         <hr />
         <xsl:call-template name='processTOC' />
         <hr />

diff --git a/amp.html b/amp.html
@@ -2,8 +2,8 @@
 <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
 <head>
 <title>XMPP Registrar: AMP</title>
-<link rel='stylesheet' type='text/css' href='/xmpp.css' />
-<link rel='shortcut icon' href='/favicon.ico' type='image/x-icon' />
+<link rel='stylesheet' type='text/css' href='https://xmpp.org/xmpp.css' />
+<link rel='shortcut icon' href='https://xmpp.org/favicon.ico' type='image/x-icon' />
 <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
 </head>
 <body>

diff --git a/announce.py b/announce.py
@@ -69,7 +69,7 @@ def getText(nodelist):
 #    The $title registry has been updated.
 #    Version: $version
 #    Changelog: $remark ($initials)
-#    URL: http://xmpp.org/registrar/$regname.html
+#    URL: https://xmpp.org/registrar/$regname.html
 
 fromaddr = "[email protected]"
 # for testing...
@@ -87,7 +87,7 @@ def getText(nodelist):
 
 versionline = 'Version: ' + version
 changelogline = 'Changelog: ' + remark + ' (' + initials + ')'
-urlline = 'URL: http://xmpp.org/registrar/' + regname + '.html'
+urlline = 'URL: https://xmpp.org/registrar/' + regname + '.html'
 
 msg = "From: XMPP Registrar <%s>\r\n" % fromaddr
 msg = msg + "To: %s\r\n" % toaddrs

diff --git a/compress.xsl b/compress.xsl
@@ -10,15 +10,15 @@
         <meta name="url" content="{$OUTPUT_FILENAME}"/>
         <meta name="save_as" content="{$OUTPUT_FILENAME}"/>
         <title><xsl:value-of select='/registry/meta/title'/></title>
-        <link rel='stylesheet' type='text/css' href='/xmpp.css' />
-        <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+        <link rel='stylesheet' type='text/css' href='https://xmpp.org/xmpp.css' />
+        <link rel='shortcut icon' type='image/x-icon' href='https://xmpp.org/favicon.ico' />
       </head>
       <body bgcolor='#FFFFFF'>
         <h2><xsl:value-of select='/registry/meta/title'/></h2>
         <xsl:apply-templates select='/registry/meta/overview'/>
         <!--<p><xsl:value-of select='/registry/meta/legal'/></p>-->
         <p>Last Updated: <xsl:value-of select='/registry/meta/revision/date'/></p>
-        <p>XML: <a href='http://xmpp.org/registrar/compress.xml'>http://xmpp.org/registrar/compress.xml</a></p>
+        <p>XML: <a href='https://xmpp.org/registrar/compress.xml'>https://xmpp.org/registrar/compress.xml</a></p>
         <hr />
         <table border='1' cellpadding='3' cellspacing='0'>
           <tr class='body'>

diff --git a/disco-categories.xsl b/disco-categories.xsl
@@ -10,15 +10,15 @@
         <meta name="url" content="{$OUTPUT_FILENAME}"/>
         <meta name="save_as" content="{$OUTPUT_FILENAME}"/>
         <title><xsl:value-of select='/registry/meta/title'/></title>
-        <link rel='stylesheet' type='text/css' href='/xmpp.css' />
-        <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+        <link rel='stylesheet' type='text/css' href='https://xmpp.org/xmpp.css' />
+        <link rel='shortcut icon' type='image/x-icon' href='https://xmpp.org/favicon.ico' />
       </head>
       <body bgcolor='#FFFFFF'>
         <h2><xsl:value-of select='/registry/meta/title'/></h2>
         <xsl:apply-templates select='/registry/meta/overview'/>
         <!--<p><xsl:value-of select='/registry/meta/legal'/></p>-->
         <p>Last Updated: <xsl:value-of select='/registry/meta/revision/date'/></p>
-        <p>XML: <a href='http://xmpp.org/registrar/disco-categories.xml'>http://xmpp.org/registrar/disco-categories.xml</a></p>
+        <p>XML: <a href='https://xmpp.org/registrar/disco-categories.xml'>https://xmpp.org/registrar/disco-categories.xml</a></p>
         <hr />
         <xsl:call-template name='processTOC' />
         <hr />

diff --git a/disco-features.xsl b/disco-features.xsl
@@ -10,15 +10,15 @@
         <meta name="url" content="{$OUTPUT_FILENAME}"/>
         <meta name="save_as" content="{$OUTPUT_FILENAME}"/>
         <title><xsl:value-of select='/registry/meta/title'/></title>
-        <link rel='stylesheet' type='text/css' href='/xmpp.css' />
-        <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+        <link rel='stylesheet' type='text/css' href='https://xmpp.org/xmpp.css' />
+        <link rel='shortcut icon' type='image/x-icon' href='https://xmpp.org/favicon.ico' />
       </head>
       <body bgcolor='#FFFFFF'>
         <h2><xsl:value-of select='/registry/meta/title'/></h2>
         <xsl:apply-templates select='/registry/meta/overview'/>
         <!--<p><xsl:value-of select='/registry/meta/legal'/></p>-->
         <p>Last Updated: <xsl:value-of select='/registry/meta/revision/date'/></p>
-        <p>XML: <a href='http://xmpp.org/registrar/disco-features.xml'>http://xmpp.org/registrar/disco-features.xml</a></p>
+        <p>XML: <a href='https://xmpp.org/registrar/disco-features.xml'>https://xmpp.org/registrar/disco-features.xml</a></p>
         <hr />
         <table border='1' cellpadding='3' cellspacing='0'>
           <tr class='body'>

diff --git a/disco.html b/disco.html
@@ -4,7 +4,7 @@
 <body>
 <title>XMPP Registrar: Service Discovery</title>
 <h2>XMPP Registrar: Service Discovery</h2>
-<p>There are two XMPP registries related to <a href='http://xmpp.org/extensions/xep-0030.html'>XEP-0030: Service Discovery</a>.</p>
+<p>There are two XMPP registries related to <a href='https://xmpp.org/extensions/xep-0030.html'>XEP-0030: Service Discovery</a>.</p>
 <ul>
   <li><a href='disco-features.html'>Service Discovery Features</a></li>
   <li><a href='disco-categories.html'>Service Discovery Identities</a></li>

diff --git a/errors.xsl b/errors.xsl
@@ -10,15 +10,15 @@
         <meta name="url" content="{$OUTPUT_FILENAME}"/>
         <meta name="save_as" content="{$OUTPUT_FILENAME}"/>
         <title><xsl:value-of select='/registry/meta/title'/></title>
-        <link rel='stylesheet' type='text/css' href='/xmpp.css' />
-        <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+        <link rel='stylesheet' type='text/css' href='https://xmpp.org/xmpp.css' />
+        <link rel='shortcut icon' type='image/x-icon' href='https://xmpp.org/favicon.ico' />
       </head>
       <body bgcolor='#FFFFFF'>
         <h2><xsl:value-of select='/registry/meta/title'/></h2>
         <xsl:apply-templates select='/registry/meta/overview'/>
         <!--<p><xsl:value-of select='/registry/meta/legal'/></p>-->
         <p>Last Updated: <xsl:value-of select='/registry/meta/revision/date'/></p>
-        <p>XML: <a href='http://xmpp.org/registrar/errors.xml'>http://xmpp.org/registrar/errors.xml</a></p>
+        <p>XML: <a href='https://xmpp.org/registrar/errors.xml'>https://xmpp.org/registrar/errors.xml</a></p>
         <hr />
         <table border='1' cellpadding='3' cellspacing='0'>
           <tr class='body'>

diff --git a/formtypes.xsl b/formtypes.xsl
@@ -10,15 +10,15 @@
         <meta name="url" content="{$OUTPUT_FILENAME}"/>
         <meta name="save_as" content="{$OUTPUT_FILENAME}"/>
         <title><xsl:value-of select='/registry/meta/title'/></title>
-        <link rel='stylesheet' type='text/css' href='/xmpp.css' />
-        <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
+        <link rel='stylesheet' type='text/css' href='https://xmpp.org/xmpp.css' />
+        <link rel='shortcut icon' type='image/x-icon' href='https://xmpp.org/favicon.ico' />
       </head>
       <body bgcolor='#FFFFFF'>
         <h2><xsl:value-of select='/registry/meta/title'/></h2>
         <xsl:apply-templates select='/registry/meta/overview'/>
         <!--<p><xsl:value-of select='/registry/meta/legal'/></p>-->
         <p>Last Updated: <xsl:value-of select='/registry/meta/revision/date'/></p>
-        <p>XML: <a href='http://xmpp.org/registrar/formtypes.xml'>http://xmpp.org/registrar/formtypes.xml</a></p>
+        <p>XML: <a href='https://xmpp.org/registrar/formtypes.xml'>https://xmpp.org/registrar/formtypes.xml</a></p>
         <hr />
         <xsl:call-template name='processTOC' />
         <hr />