This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis-site.git
commit 156651f63186ced5a164df7c7dbac724316fcd4e Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Mon Sep 27 15:31:25 2021 +0200 Replace instructions about web site management (CMS replaced by Hugo). --- README.md | 12 +++--------- source/site-management.md | 42 ++++++++++++++++++------------------------ 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 92ecfa2..fc8c395 100644 --- a/README.md +++ b/README.md @@ -36,13 +36,7 @@ See [Hugo](https://gohugo.io/) for more info and for details how to install Hugo ## Generate the website -To generate the static website, execute `hugo` to generate and serve the website on `localhost:1313`. +To generate the static website, execute `hugo` to generate in the `target/` directory. -During development, it may be useful to run an incremental build. For this to -work, execute `hugo server -D` to continuously generate and serve the website on -`localhost:1313`. - -## Building and publishing the website - -[gitpubsub](https://www.apache.org/dev/gitpubsub.html) is used to publish the -site, using the content from the `asf-site` branch. +During development, it may be useful to run an incremental build. For this to work, +execute `hugo server -D` to continuously generate and serve the website on `localhost:1313`. diff --git a/source/site-management.md b/source/site-management.md index 6792cc5..111fd71 100644 --- a/source/site-management.md +++ b/source/site-management.md @@ -2,14 +2,9 @@ title: Site management --- -<!-- TODO: remove? --> - This page explains how the Apache SIS web site is created and how to update the site. The intended audiences are SIS release managers and SIS web site maintainers. -General documentation about Apache Content Management System (CMS) can be found in the [CMS reference][cms] page. -The remaining of this page is specific to the SIS project. - {{< toc >}} # Directory layout {#directory-layout} @@ -17,24 +12,25 @@ The remaining of this page is specific to the SIS project. The source files for the Apache SIS web site can be fetched from Subversion using the following command: {{< highlight bash >}} -svn checkout https://svn.apache.org/repos/asf/sis/site/trunk site +git clone https://github.com/apache/sis-site {{< / highlight >}} The directory layout is as below, omitting version numbers in file names. The `*` character stands for an arbitrary amount of files having the given extension. {{< highlight text >}} -site -├─ css -│ ├─ bootstrap.min.css -│ └─ sis.css -├─ img -│ └─ *.png -├─ js -│ ├─ bootstrap.js -│ └─ jquery.js -├─ content +sis-site +├─ source │ └─ *.mdtext +├─ static +│ ├─ css +│ │ ├─ bootstrap.min.css +│ │ └─ sis.css +│ ├─ img +│ │ └─ *.png +│ ├─ js +│ │ ├─ bootstrap.js +│ │ └─ jquery.js └─ templates ├─ single_narrative.html └─ skeleton.html @@ -46,15 +42,13 @@ All files with the `.mdtext` extension use the Markdown format, which is describ * [Extension to the syntax][extension] New `.mdtext` files can be created using the [site-management.mdtext][template] file as a template. -Those files can be modified in any text editor and committed with the usual Subversion commands. -Each commit will trig a new site build, which will be visible in the _staging_ area at +Thee files can be modified in any text editor and committed with the usual Git commands. +The site must be built manually by executing the `hugo` comment from the project root directory. +The web site will be written in the `target/content/` sub-directory. +Copying those files in the `asf-staging` branch will make them visible in the _staging_ area at [https://sis.staged.apache.org/](https://sis.staged.apache.org/). -The build progress can be monitored on the [Buildbot][buildbot] page, but they are usually very fast. -Once a staging site has been approved, it can be published to -[https://sis.apache.org](https://sis.apache.org) as below: - -* Login to the [ASF Content Management System][cms-admin]. -* Click on _Publish sis site_. +Once a staging site has been approved, it can be published by merging the `asf-staging` branch +to the `asf-site` branch. # Content {#content}