kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'development' into 724-template-extension-fix

Browse Source
This commit is contained in:
Christian Goll
2023-03-21 08:32:28 +01:00
committed by GitHub
parent 225d8a1379 0bdfcb1c00
commit 4fff291172
9 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
list. list.
- Added a missing `.ww` extension to the `70-ww4-netname.rules` template in the - Added a missing `.ww` extension to the `70-ww4-netname.rules` template in the
wwinit overlay. wwinit overlay.
- Restrict access to `/warewulf/config` to root only. (#728, #742)
### Changed ### Changed

2
Makefile
View File

@@ -188,7 +188,7 @@ files: all
chmod 600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh* chmod 600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh*
chmod 600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/NetworkManager/system-connections/ww4-managed.ww chmod 600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/NetworkManager/system-connections/ww4-managed.ww
chmod 644 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh*.pub.ww chmod 644 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh*.pub.ww
chmod 644 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/warewulf/config.ww chmod 600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/warewulf/config.ww
chmod 750 $(DESTDIR)$(WWOVERLAYDIR)/host chmod 750 $(DESTDIR)$(WWOVERLAYDIR)/host
install -m 0755 wwctl $(DESTDIR)$(BINDIR) install -m 0755 wwctl $(DESTDIR)$(BINDIR)
install -m 0755 wwapic $(DESTDIR)$(BINDIR) install -m 0755 wwapic $(DESTDIR)$(BINDIR)

4
internal/app/api/wwapird_curls/curls.sh
View File

@@ -15,7 +15,7 @@ curl --cacert /usr/local/etc/warewulf/keys/cacert.pem \
curl http://localhost:9871/v1/container curl http://localhost:9871/v1/container
# container import # container import
curl -d '{"source": "docker://warewulf/rocky:8", "name": "rocky-8", "update": true, "default": true}' -H "Content-Type: application/json" -X POST http://localhost:9871/v1/container curl -d '{"source": "docker://ghcr.io/hpcng/warewulf-rockylinux:8", "name": "rocky-8", "update": true, "default": true}' -H "Content-Type: application/json" -X POST http://localhost:9871/v1/container
# container delete # container delete
curl -X DELETE http://localhost:9871/v1/container?containerNames=rocky-8 curl -X DELETE http://localhost:9871/v1/container?containerNames=rocky-8
@@ -54,4 +54,4 @@ curl http://localhost:9871/v1/nodestatus?nodeNames=testApiNode0
# node delete single node # node delete single node
curl -X DELETE http://localhost:9871/v1/node?nodeNames=testApiNode0 curl -X DELETE http://localhost:9871/v1/node?nodeNames=testApiNode0
curl -X DELETE http://localhost:9871/v1/node?nodeNames=testApiNode1 curl -X DELETE http://localhost:9871/v1/node?nodeNames=testApiNode1

2
internal/app/wwctl/container/imprt/root.go
View File

@@ -16,7 +16,7 @@ are:
* /path/to/archive/tar/ball * /path/to/archive/tar/ball
* /path/to/chroot/ * /path/to/chroot/
Imported containers are used to create bootable VNFS images.`, Imported containers are used to create bootable VNFS images.`,
Example: "wwctl container import docker://warewulf/centos-8 my_container", Example: "wwctl container import docker://ghcr.io/hpcng/warewulf-rockylinux:8 rockylinux-8",
RunE: CobraRunE, RunE: CobraRunE,
Args: cobra.MinimumNArgs(1), Args: cobra.MinimumNArgs(1),
} }

2
userdocs/contents/containers.rst
View File

@@ -48,7 +48,7 @@ Here is an example of importing from Docker Hub.
.. code-block:: console .. code-block:: console
# wwctl container import docker://warewulf/rocky rocky-8 # wwctl container import docker://ghcr.io/hpcng/warewulf-rockylinux:8 rocky-8
Getting image source signatures Getting image source signatures
Copying blob d7f16ed6f451 done Copying blob d7f16ed6f451 done
Copying config da2ca70704 done Copying config da2ca70704 done

2
userdocs/contributing/development-environment-kvm.rst
View File

@@ -102,7 +102,7 @@ Build and install Warewulf on wwdev
sudo wwctl configure ssh # Build the basic ssh keys to be included by the default system overlay sudo wwctl configure ssh # Build the basic ssh keys to be included by the default system overlay
# Pull and build the VNFS container and kernel # Pull and build the VNFS container and kernel
sudo wwctl container import docker://warewulf/centos-8 centos-8 --setdefault sudo wwctl container import docker://ghcr.io/hpcng/warewulf-centos:7 centos-7 --setdefault
sudo wwctl kernel import build $(uname -r) --setdefault sudo wwctl kernel import build $(uname -r) --setdefault
# Set up the default node profile # Set up the default node profile

2
userdocs/contributing/development-environment-vbox.rst
View File

@@ -117,7 +117,7 @@ I have VirtualBox running on my desktop.
sudo wwctl configure ssh --persist # Build the basic ssh keys to be included by the default system overlay sudo wwctl configure ssh --persist # Build the basic ssh keys to be included by the default system overlay
# Pull and build the VNFS container and kernel # Pull and build the VNFS container and kernel
sudo wwctl container import docker://warewulf/centos-7 centos-7 --setdefault sudo wwctl container import docker://ghcr.io/hpcng/warewulf-centos:7 centos-7 --setdefault
sudo wwctl kernel import build $(uname -r) --setdefault sudo wwctl kernel import build $(uname -r) --setdefault
# Set up the default node profile # Set up the default node profile

2
userdocs/quickstart/el7.rst
View File

@@ -103,7 +103,7 @@ default running kernel from the controller node and set both in the
.. code-block:: bash .. code-block:: bash
sudo wwctl container import docker://warewulf/centos-7 centos-7 --setdefault sudo wwctl container import docker://ghcr.io/hpcng/warewulf-centos:7 centos-7 --setdefault
sudo wwctl kernel import $(uname -r) --setdefault sudo wwctl kernel import $(uname -r) --setdefault
Set up the default node profile Set up the default node profile

2
userdocs/quickstart/el8.rst
View File

@@ -105,7 +105,7 @@ default running kernel from the controller node and set both in the
.. code-block:: bash .. code-block:: bash
sudo wwctl container import docker://warewulf/rocky:8 rocky-8 sudo wwctl container import docker://ghcr.io/hpcng/warewulf-rockylinux:8 rocky-8
Set up the default node profile Set up the default node profile