Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
4d7aab6541 | ||
ee63b48d87 | |||
870ad461ef | |||
90be375161 | |||
e009155a72 |
@ -24,8 +24,11 @@ RUN mkdir -p /opt/mirrormanager2
|
||||
WORKDIR /opt/mirrormanager2
|
||||
RUN git clone https://github.com/fedora-infra/mirrormanager2.git .
|
||||
|
||||
RUN sed -e 's/signed_fpca/signed_rosca/' -i mirrormanager2/perms.py mirrormanager2/auth.py
|
||||
RUN pip install --prefix=/install .
|
||||
|
||||
RUN pip install --prefix=/install flask_session
|
||||
|
||||
# Stage 2: Final stage with runtime dependencies
|
||||
FROM quay.io/fedora/python-312:latest AS runtime
|
||||
LABEL \
|
||||
|
@ -44,13 +44,22 @@ THEME_FOLDER = os.environ.get('MM2_THEME_FOLDER', 'fedora')
|
||||
#MM_AUTHENTICATION = "fas"
|
||||
|
||||
OIDC_CLIENT_SECRETS = "/etc/mirrormanager/client_secrets.json"
|
||||
OIDC_SCOPES = " ".join(
|
||||
[
|
||||
"openid",
|
||||
"email",
|
||||
"profile",
|
||||
"https://id.fedoraproject.org/scope/groups",
|
||||
"https://id.fedoraproject.org/scope/agreements",
|
||||
]
|
||||
)
|
||||
|
||||
# If the authentication method is `fas`, groups in which should be the user
|
||||
# to be recognized as an admin.
|
||||
#ADMIN_GROUP = ["sysadmin-main"]
|
||||
ADMIN_GROUP = ["infrastructure"]
|
||||
|
||||
# Email of the admin to which send notification or error
|
||||
ADMIN_EMAIL = "admin@fedoraproject.org"
|
||||
ADMIN_EMAIL = "infrastructure@rockylinux.org"
|
||||
|
||||
# Email address used in the "From" field of the emails sent.
|
||||
# Default: ``nobody@fedoraproject.org``.
|
||||
|
8
run.py
8
run.py
@ -1,5 +1,13 @@
|
||||
from werkzeug.middleware.proxy_fix import ProxyFix
|
||||
from mirrormanager2.app import create_app
|
||||
from flask_session import Session
|
||||
from cachelib.file import FileSystemCache
|
||||
import os
|
||||
|
||||
application = create_app()
|
||||
application.debug = os.environ.get("MM2_DEBUG", False)
|
||||
application.config['SESSION_TYPE'] = "cachelib"
|
||||
application.config['SESSION_CACHELIB'] = FileSystemCache(cache_dir='/tmp/sessions', threshold=500)
|
||||
Session(application)
|
||||
application.wsgi_app = ProxyFix(application.wsgi_app, x_proto=1, x_host=1)
|
||||
|
||||
|
19
start-dev.sh
Normal file → Executable file
19
start-dev.sh
Normal file → Executable file
@ -2,13 +2,6 @@ POD=mirrormanager2
|
||||
|
||||
podman pod exists $POD || podman pod create -p 5000:5000 -n $POD
|
||||
|
||||
#podman run \
|
||||
# --pod $POD \
|
||||
# --name nginx \
|
||||
# --replace \
|
||||
# -v $PWD/nginx.conf:/etc/nginx/conf.d/default.conf:ro \
|
||||
# -d docker.io/library/nginx:1.13-alpine
|
||||
|
||||
test -d tmp || mkdir tmp
|
||||
test -f client_secrets.json || (echo "missing client_secrets" && exit 2)
|
||||
|
||||
@ -22,11 +15,13 @@ podman run \
|
||||
-e "MM2_SECRET_KEY=$(openssl rand -hex 32)" \
|
||||
-e "MM2_PASSWORD_SEED=$(openssl rand -hex 32)" \
|
||||
-e 'MM2_THEME_FOLDER=rocky' \
|
||||
-v $PWD/mirrormanager2.cfg:/etc/mirrormanager/mirrormanager2.cfg \
|
||||
-v $PWD/client_secrets.json:/etc/mirrormanager/client_secrets.json \
|
||||
-v $PWD/tmp:/var/tmp:rw \
|
||||
-v $PWD/static:/usr/lib/python3.12/site-packages/mirrormanager2/static \
|
||||
-v $PWD/templates:/usr/lib/python3.12/site-packages/mirrormanager2/templates \
|
||||
-e 'FLASK_DEBUG=1' \
|
||||
-e 'MM2_DEBUG=1' \
|
||||
-v $PWD/mirrormanager2.cfg:/etc/mirrormanager/mirrormanager2.cfg:z,ro \
|
||||
-v $PWD/client_secrets.json:/etc/mirrormanager/client_secrets.json:z,ro \
|
||||
-v $PWD/tmp:/var/tmp:z,rw \
|
||||
-v $PWD/static:/usr/lib/python3.12/site-packages/mirrormanager2/static:z,ro \
|
||||
-v $PWD/templates:/usr/lib/python3.12/site-packages/mirrormanager2/templates:z,ro \
|
||||
-d git.resf.org/infrastructure/mirrormanager2:dev
|
||||
|
||||
# Setup sqlite database
|
||||
|
@ -31,7 +31,9 @@ form.icon button {
|
||||
}
|
||||
|
||||
/* Stealed this from bootstrap */
|
||||
label, select, button,
|
||||
label,
|
||||
select,
|
||||
button,
|
||||
input[type="button"],
|
||||
input[type="reset"],
|
||||
input[type="submit"],
|
||||
@ -41,31 +43,33 @@ input[type="checkbox"] {
|
||||
}
|
||||
|
||||
.blue {
|
||||
color:#0066CC;
|
||||
color: #0066cc;
|
||||
}
|
||||
|
||||
#matrixtitle {
|
||||
background-color: #2963A6;
|
||||
color: #FFFFFF;
|
||||
background-color: #2963a6;
|
||||
color: #ffffff;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#matrixheadings, #matrixheadings th {
|
||||
background-color: #DDDDDD;
|
||||
border-bottom: 1px solid #BBBBBB;
|
||||
#matrixheadings,
|
||||
#matrixheadings th {
|
||||
background-color: #dddddd;
|
||||
border-bottom: 1px solid #bbbbbb;
|
||||
margin: 0;
|
||||
color: #333333;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.matrix_section, .matrix_section td {
|
||||
border-bottom: 1px solid #BBBBBB !important;
|
||||
.matrix_section,
|
||||
.matrix_section td {
|
||||
border-bottom: 1px solid #bbbbbb !important;
|
||||
}
|
||||
|
||||
.matrix_even, .matrix_even td {
|
||||
background-color: #F0F0F0;
|
||||
border-bottom: 1px solid #DDDDDD;
|
||||
border-top: 1px solid #DDDDDD;
|
||||
.matrix_even,
|
||||
.matrix_even td {
|
||||
background-color: #f0f0f0;
|
||||
border-bottom: 1px solid #dddddd;
|
||||
border-top: 1px solid #dddddd;
|
||||
}
|
||||
|
||||
.centered {
|
||||
@ -76,10 +80,9 @@ input[type="checkbox"] {
|
||||
}
|
||||
|
||||
.bodycontent {
|
||||
min-height:600px
|
||||
min-height: 600px;
|
||||
}
|
||||
|
||||
|
||||
table.mm2-table-small {
|
||||
width: auto;
|
||||
}
|
||||
|
318733
static/rocky/rocky.css
318733
static/rocky/rocky.css
File diff suppressed because it is too large
Load Diff
@ -30,9 +30,9 @@
|
||||
{% endmacro %}
|
||||
|
||||
{% macro footer() %}
|
||||
<div class="footer py-5 text-white">
|
||||
<div class="footer py-5">
|
||||
<div class="container">
|
||||
<div class="row footerlinks justify-content-center">
|
||||
<div class="row footerlinks">
|
||||
<div class="col-sm-3 col-4 mt-3">
|
||||
<div>
|
||||
<dl>
|
||||
@ -67,17 +67,16 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row footerlinks">
|
||||
<div class="col-12 text-center">
|
||||
<div class="row footerlinks mt-5">
|
||||
<div class="col-12">
|
||||
<p> © 2024 Rocky Enterprise Software Foundation, and others. </p>
|
||||
</div>
|
||||
<div class="col-12 text-center">
|
||||
<div class="col-12">
|
||||
{% set noggin_link %}
|
||||
<a href="https://github.com/fedora-infra/noggin">noggin</a>
|
||||
{% endset %}
|
||||
<p>
|
||||
<a href="https://github.com/fedora-infra/mirrormanager2/">mirrormanager</a>
|
||||
-- {{version}}
|
||||
-- <a href="http://mirrormanager.rtfd.org" rel="noopener noreferrer"
|
||||
target="_blank">Documentation</a>
|
||||
-- <a href="http://mirrormanager.readthedocs.org/en/latest/contributors.html">Authors</a></p>
|
||||
@ -108,7 +107,6 @@ href="{{ url_for('static', filename='favicon.ico')}}"/>
|
||||
<link rel="stylesheet" type="text/css" media="screen"
|
||||
href="{{ url_for('static', filename='mirrormanager2.css') }}"/>
|
||||
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='rocky.css') }}"/>
|
||||
<link href="{{ url_for('static', filename='fedora-bootstrap/fedora-bootstrap.min.css') }}" rel="stylesheet" />
|
||||
<link href="{{ url_for('static', filename='fonts/open-sans.css') }}" rel="stylesheet" />
|
||||
<link href="{{ url_for('static', filename='fonts/font-awesome.css') }}" rel="stylesheet" />
|
||||
{% endmacro %}
|
||||
@ -124,8 +122,8 @@ href="{{ url_for('static', filename='mirrormanager2.css') }}"/>
|
||||
{%endmacro%}
|
||||
|
||||
{% macro nav(is_admin) %}
|
||||
<nav class="navbar navbar-expand-lg navbar-light masthead py-2">
|
||||
<a class="navbar-brand" href="{{url_for('base.index')}}"><img src="{{ url_for('static', filename='mirrormanager-logo.png') }}" alt="Fedora Account System logo" height="40"></a>
|
||||
<nav class="navbar navbar-expand-lg navbar-light masthead py-2 container">
|
||||
<a class="navbar-brand" href="{{url_for('base.index')}}"><img src="{{ url_for('static', filename='mirrormanager-logo.png') }}" alt="Fedora Account System logo" height="60"></a>
|
||||
<ul class="navbar-nav align-items-center ms-auto">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link color-white" href="{{url_for('base.list_mirrors')}}">Mirrors</a>
|
||||
@ -160,7 +158,7 @@ href="{{ url_for('static', filename='mirrormanager2.css') }}"/>
|
||||
</div>
|
||||
</li>
|
||||
{% else %}
|
||||
<a class="btn btn-primary ml-2" href="{{ url_for('auth.login') }}?next={{request.url}}">Login</a>
|
||||
<a class="btn btn-primary ml-2 py-2 rounded-4" href="{{ url_for('auth.login') }}?next={{request.url}}">Login</a>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</nav>
|
||||
|
@ -1,6 +1,6 @@
|
||||
{% extends 'admin/admin_master.html' %}
|
||||
{% extends 'admin/master.html' %}
|
||||
|
||||
{% block content %}
|
||||
{% block body %}
|
||||
<p>
|
||||
These pages present the admin interface of MirrorManager.
|
||||
</p>
|
||||
|
@ -4,7 +4,7 @@
|
||||
{%block tag %}home{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h2>Rocky Public Active Mirrors</h2>
|
||||
<h2 class="h1 mb-4">Rocky Public Active Mirrors</h2>
|
||||
|
||||
<p>
|
||||
Rocky Linux is distributed to millions of systems globally.
|
||||
@ -34,14 +34,8 @@ I2 means both Internet2 and its peer high speed research and development
|
||||
networks globally.
|
||||
</p>
|
||||
|
||||
|
||||
<table class="table table-sm">
|
||||
<tr id="matrixtitle">
|
||||
<th colspan="{{ arches | length + 2 }}">
|
||||
Mirror list filtering matrix
|
||||
</th>
|
||||
</tr>
|
||||
<tr id="matrixheadings" >
|
||||
<table class="table table-sm mt-5">
|
||||
<tr id="matrixheadings">
|
||||
<th>Projects</th>
|
||||
<th>Versions</th>
|
||||
<th colspan="{{ arches | length}}">
|
||||
|
@ -17,7 +17,7 @@ main {
|
||||
/* Prose */
|
||||
.prose code,
|
||||
.prose strong {
|
||||
@apply dark:text-gray-300;
|
||||
@apply dark:text-gray-300;
|
||||
}
|
||||
.prose h1,
|
||||
.prose h2,
|
||||
@ -25,23 +25,36 @@ main {
|
||||
.prose h4,
|
||||
.prose h5,
|
||||
.prose h6 {
|
||||
@apply dark:text-white;
|
||||
@apply dark:text-white;
|
||||
}
|
||||
.prose a {
|
||||
@apply text-green-600;
|
||||
@apply text-green-600;
|
||||
}
|
||||
|
||||
.prose blockquote {
|
||||
@apply dark:text-white;
|
||||
@apply dark:text-white;
|
||||
}
|
||||
|
||||
.prose img {
|
||||
@apply rounded-md;
|
||||
@apply rounded-md;
|
||||
}
|
||||
|
||||
[type='text'], [type='email'], [type='url'], [type='password'], [type='number'], [type='date'], [type='datetime-local'], [type='month'], [type='search'], [type='tel'], [type='time'], [type='week'], [multiple], textarea, select {
|
||||
@apply
|
||||
rounded-md bg-gray-100 dark:bg-gray-700
|
||||
[type="text"],
|
||||
[type="email"],
|
||||
[type="url"],
|
||||
[type="password"],
|
||||
[type="number"],
|
||||
[type="date"],
|
||||
[type="datetime-local"],
|
||||
[type="month"],
|
||||
[type="search"],
|
||||
[type="tel"],
|
||||
[type="time"],
|
||||
[type="week"],
|
||||
[multiple],
|
||||
textarea,
|
||||
select {
|
||||
@apply rounded-md bg-gray-100 dark:bg-gray-700
|
||||
dark:border-gray-600 border-gray-300 border-2
|
||||
py-2 px-3
|
||||
focus:outline-none focus:ring focus:ring-2 focus:border-green-600 focus:ring-green-500
|
||||
@ -49,15 +62,15 @@ main {
|
||||
}
|
||||
|
||||
.form-group label {
|
||||
@apply text-sm font-medium mb-2;
|
||||
@apply text-sm font-medium mb-2;
|
||||
}
|
||||
.form-group .check-box input {
|
||||
@apply rounded-md bg-gray-100 dark:bg-gray-700
|
||||
@apply rounded-md bg-gray-100 dark:bg-gray-700
|
||||
dark:border-gray-600 border-gray-300 border-2
|
||||
p-1 checked:bg-green-600 checked:border-transparent
|
||||
focus:outline-none focus:ring focus:ring-1 focus:border-green-600 focus:ring-green-500
|
||||
transition duration-300 ease-in-out;
|
||||
}
|
||||
.form-group .check-box label {
|
||||
@apply mb-0 ml-2;
|
||||
}
|
||||
@apply mb-0 ml-2;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user