Commit 3f2303ea authored by jan.koester's avatar jan.koester
Browse files

apps: default registry apps.fenriros.org on 443, drop the pinned certificate 

Co-Authored-By: default avatarClaude Opus 5.5 <noreply@anthropic.com>
parent cd657dcc

CMakeLists.txt

+0 −1
Changes for CMakeLists.txt: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -60,6 +60,5 @@ target_link_libraries(containerctl PRIVATE sysbus::sysbus) 
install(TARGETS containerd containerctl RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})

install(DIRECTORY include/containerd DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

install(FILES dist/registries.conf DESTINATION /etc/containerd)

install(DIRECTORY dist/certs.d DESTINATION /etc/containerd)

set(CONTAINERD_UNITDIR "/etc/syslite/services" CACHE PATH "syslite unit directory")

install(FILES dist/containerd.service DESTINATION ${CONTAINERD_UNITDIR})

dist/certs.d/apps.fenriros.org:5000.pem

deleted100644 → 0
+0 −18
Changes for dist/certs.d/apps.fenriros.org:5000.pem: 0 added lines, 18 removed lines.
Original line number Diff line number Diff line 
-----BEGIN CERTIFICATE-----

MIIC6DCCAdCgAwIBAgIIMJOwSkm1SpYwDQYJKoZIhvcNAQELBQAwHDEaMBgGA1UE

AwwRYXBwcy5mZW5yaXJvcy5vcmcwHhcNMjYxMTAxMDEyMTI4WhcNMjcxMjAzMDEy

MTI4WjAcMRowGAYDVQQDDBFhcHBzLmZlbnJpcm9zLm9yZzCCASIwDQYJKoZIhvcN

AQEBBQADggEPADCCAQoCggEBAJa5kbBBLrq/0nmPBO7cl+ADkj50orthG6NbdhSY

iRAOqwxFSDmeSi/k3p2aMLnU+y1RIjy0Irj3hlEKA4n9Aql3NseJa8KHWHx8QK30

4FUkn/aAC9wFKmBkgOASpzP59JWqxq5mjXYT4nyNtISRyoMoNheOYjfrxR6FiqwM

0dD6VoFZ2n7oL6oakohCPN0jZORlMno+BPa69du7VgYl50lBzMTiKvHdmXmG6i0+

M3bk7UqEsCxeFmp3l4Jaceyusbo3H443QVkwa7wPHNgUEFNEJFeaB4U5zrn6WD2m

PbTAlsxia8xLyyPYugPur0c7nhdYb7IBsJ8q+x6tscQG1U8CAwEAAaMuMCwwHAYD

VR0RBBUwE4IRYXBwcy5mZW5yaXJvcy5vcmcwDAYDVR0TAQH/BAIwADANBgkqhkiG

9w0BAQsFAAOCAQEAIu7a94ksOV9UZtuz6ZZ9+12FLKyku/mYXAvV8f96R42MeE9o

VWV0Ti3Wr19OtQ8CexoXyT+h8NV4HeiIiRPpJKZdAIqUU/H0YQkDvN3vQq4r2nP6

DQqqWdMOd6S0qI2oOQCPhbzRUfabfno4CJl+8qiLt9QxofJN3B937uV2pnvLpfp7

la7I7ui+GsIjWpwQjWl7Gs8Vc9W5La7r3reDe0+3udjB3+B0WRiD/HZ5tzlpf44E

5TABSP9Hrc2AjueOuZcITFlgKpXSeWbhndqsuswmMkApEczm+anHGxNHWjpF5yWy

Y2tp2DPw2B7if4cdXhIo7W0u1Gks07bktk0Xmw==

-----END CERTIFICATE-----

dist/registries.conf

+1 −1
Changes for dist/registries.conf: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ 
#

# Where the web interface's apps come from (a FenStore):

# [apps]

# Registry=apps.fenriros.org:5000
 
# Registry=apps.fenriros.org

include/containerd/api.h

+1 −1
Changes for include/containerd/api.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 * ---- apps ----

 *

 * Apps are the repositories of one FenStore registry, by default

 * apps.fenriros.org:5000 ([apps] Registry= in registries.conf): the public

 * apps.fenriros.org ([apps] Registry= in registries.conf): the public

 * ones, and those its credentials there may read. Asking a registry can

 * take long, so a job reads them into a cache:

 *

src/registry.cpp

+1 −1
Changes for src/registry.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ bool lowerHex(const std::string &s) { 
    return !s.empty() && s.find_first_not_of("0123456789abcdef") == std::string::npos;

}



const char *const DefaultAppRegistry = "apps.fenriros.org:5000";

const char *const DefaultAppRegistry = "apps.fenriros.org";



// registries.conf: [domain] User= Password= Insecure=

void credentials(const std::string &domain, std::string &user, std::string &password, bool &insecure) {