summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot@culturestrings <root@culturestrings>2020-06-05 18:11:38 +0000
committerroot@culturestrings <root@culturestrings>2020-06-06 00:45:25 +0000
commit026bf1b4a9557052a3e5328069e3a994107b8b9f (patch)
treeea8b833033127bfb06c9983512791ad694131b2a
parent2faeb7c9481ee401ce40217e24208c7162421add (diff)
downloadculturestrings-026bf1b4a9557052a3e5328069e3a994107b8b9f.tar.bz2
culturestrings-026bf1b4a9557052a3e5328069e3a994107b8b9f.tar.xz
pagure: make the configuration file site-agnostic.
-rwxr-xr-x[-rw-r--r--]public/fs/etc/pagure/pagure-cfg.sh10
-rw-r--r--public/fs/etc/pagure/pagure.cfg.in36
2 files changed, 22 insertions, 24 deletions
diff --git a/public/fs/etc/pagure/pagure-cfg.sh b/public/fs/etc/pagure/pagure-cfg.sh
index e2bf7a3..ae15d36 100644..100755
--- a/public/fs/etc/pagure/pagure-cfg.sh
+++ b/public/fs/etc/pagure/pagure-cfg.sh
@@ -2,6 +2,7 @@
set -eu
+source /root/config/private/config/hostname
source /root/config/private/config/server.ports
source /root/config/private/keys/pagure/pagure.keys
@@ -9,4 +10,13 @@ sed -e 's/@ssh_port@/'${ssh_port}'/g' \
-e 's/@pagure_flask_key@/'${pagure_flask_key}'/g' \
-e 's/@pagure_pgsql_key@/'${pagure_pgsql_key}'/g' \
-e 's/@pagure_email_key@/'${pagure_email_key}'/g' \
+ -e 's/@sitename@/'${sitename}'/g' \
+ -e 's/@sitezone@/'${sitezone}'/g' \
+ -e 's/@sitemask@/'${sitemask}'/g' \
+ -e 's/@smtphost@/'${smtphost}'/g' \
+ -e 's/@docssite@/'${docssite}'/g' \
+ -e 's/@docszone@/'${docszone}'/g' \
+ -e 's/@devadmin@/'${devadmin}'/g' \
"$1"
+
+cat /root/config/private/config/pagure_ssh.pub
diff --git a/public/fs/etc/pagure/pagure.cfg.in b/public/fs/etc/pagure/pagure.cfg.in
index 5ea2fb0..d17a347 100644
--- a/public/fs/etc/pagure/pagure.cfg.in
+++ b/public/fs/etc/pagure/pagure.cfg.in
@@ -5,9 +5,9 @@ from pagure.default_config import ACLS
### site meta
-INSTANCE_NAME = 'midipix'
-ADMIN_EMAIL = 'pagure@midipix.org'
-THEME = 'midipix'
+INSTANCE_NAME = '@sitename@'
+ADMIN_EMAIL = 'pagure@@sitezone@'
+THEME = '@sitename@'
### pagure authentication
@@ -39,7 +39,7 @@ DB_URL = 'postgres://pagure:@pagure_pgsql_key@@localhost/pa
### site administration
FEDMSG_NOTIFICATIONS = False
PAGURE_AUTH = 'local'
-PAGURE_ADMIN_USERS = ['midipix']
+PAGURE_ADMIN_USERS = ['@devadmin@']
ADMIN_GROUP = []
ADMIN_SESSION_LIFETIME = timedelta(minutes=120)
@@ -78,21 +78,21 @@ VIRUS_SCAN_ATTACHMENTS = False
### SMTP settings
-SMTP_SERVER = 'mail.culturestrings.org'
+SMTP_SERVER = 'mail.@smtphost@'
SMTP_PORT = 25
SMTP_STARTTLS = True
SMTP_SSL = False
SMTP_USERNAME = None
SMTP_PASSWORD = None
-FROM_EMAIL = 'pagure@midipix.org'
+FROM_EMAIL = 'pagure@@sitezone@'
SALT_EMAIL = '@pagure_email_key@'
-DOMAIN_EMAIL_NOTIFICATIONS = 'midipix.org'
+DOMAIN_EMAIL_NOTIFICATIONS = '@sitezone@'
### web frontend
-APP_URL = 'https://dev.midipix.org'
-DOC_APP_URL = 'https://docs.foss21.org'
+APP_URL = 'https://dev.@sitezone@'
+DOC_APP_URL = 'https://docs.@docszone@'
SHORT_LENGTH = 6
ITEM_PER_PAGE = 50
@@ -101,15 +101,15 @@ MAX_CONTENT_LENGTH = 4 * 1024 * 1024
### web backend
APPLICATION_ROOT = '/'
-SESSION_COOKIE_NAME = 'pagure_at_midipix_dot_org'
+SESSION_COOKIE_NAME = 'pagure_at_@sitemask@'
SESSION_COOKIE_SECURE = True
CHECK_SESSION_IP = False
OLD_VIEW_COMMIT_ENABLED = False
### git frontend
-GIT_URL_SSH = 'ssh://git@midipix.org:@ssh_port@/'
-GIT_URL_GIT = 'https://dev.midipix.org/'
+GIT_URL_SSH = 'ssh://git@@sitezone@:@ssh_port@/'
+GIT_URL_GIT = 'https://dev.@sitezone@/'
### gunicorn
@@ -159,15 +159,3 @@ SSH_KEYS_OPTIONS = (
'restrict,command="/usr/lib/pagure/aclchecker.py %(username)s"'
)
-
-SSH_KEYS = {
- 'ED25519': {
- 'pubkey': ' dev.midipix.org,95.216.227.143,2a01:4f9:2b:20f0::2 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILp9B8XCCKYUzueIICIJBmxHIOovaup9SKJdyQWAem8U',
- 'SHA256': ' SHA256:+KTUN+cN7AYorPHeST7SFmKyKuYzRXmIIyHlrIGdXiA',
- },
-
- 'RSA': {
- 'pubkey': ' dev.midipix.org,95.216.227.143,2a01:4f9:2b:20f0::2 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDTtBBrmKbdLetolYmLviwDc2iFNDdT5D19C9nG4QmE02M2hLHpQC32K3EAKLdKTVWPn2BAdIl0KuUw/6k6F9XUklFDW+rprM1hiHwTjJKMEn1p8gY0iCEZHGAxjcejiiRYCc4iwvzuuHjMMlbaOrQbiPP/GD8BG1KnoHbVpWHDDifzXRx8kCo6qmk5HvM9wCncqEFE/NR6bsNl4MwRXSaDgOoGKlIC3gsEizXQbxGZ7dsdcBPcw8KoLnvY8px5WCA3C2gDeTe1V5siTMsfZ/1BJoYWYsV+6AR51C1EUF5ejekdPQCCn4YbIRGIfkmY9/Kyco1AThJ3kRHXFGC8SPo06Z3NJDyxLOiOKx1qQ3/fX6t+UApESnX6EEv6ljk/37iPZyfJ//zCSnPPUR1IPDIzt3SPPp4ZJk/o3L/l2nHKdxChCPAtMOww+qjhEPg1Nwf+twSYbdxXV9eLJBTR4BPzkJ6h7qHmmHaAZtUAFHDSsMRY14y8SOGHWcr8LFfPcbo5bYFfAjdmlpd9LASpDo3GiarU6IPv9+pCdeCQfp8ereQIRW6GNByb2j/zEpPeO9KB5g6+fjVWgYZjUaqo3Kmnb5esMexvaKFdI5DjZoptGNzUSJf3v7qG4L3JF+okFXzfln80BdZfQWUiQcUBfXgCzrbam5EaIT0aFUEmtlP+ceI4rlxvhae6QG9nu6J6vDgg5reXqmrtA0eWVZ+iuTNut5aCwN9RSc8XQ+dO/9sWIifhrP614s8XX+10nOuzke1ZLVX75gozEHT+qEIIslPnAwdiRx+GZpWRDT3knGwo3cQLi/2yQNyNScyxYGnDMuS847sISH+BBVgOubqzmQDbUDl5d93EWDGN1EPc11i83j5axXdd+/9diCIxvWZzYr+0JajDT51hjJHos5MYoflvS1sGHyBmV9mIC9tIvp2pd8xtU+UC2a8etOo6BiVeXeSdqFfZ91Pdd4jkFK/bstqjyog4qopllpkApJeKb4Tpnl+7SPNu7I6hwPS/NWIVQnhGFCWUxXtzdLTzy5ybQ3444L2I+vYaZuMzaDt0nOdgV2iTFTqUtCqqm4H9SvP4PSDnizZNfNGEINpL1TCAkqfZArajJW1IJXW1v+v2ApbsspKOR4t87+EHvz87TceKLfQAiwPHYYb1pjqk022Q/EWLfyiXqK+hYCCaAMoqnjouB77+r6QEkGss6/XoQPCxhzAUixRSGExvvWZm/FJUUq5jdmN3NmT/t88d9Qd6K6KW9ACPaBKAKraTqVWPrPCDV3/iW/3HPYT8hPdMsLYeXoGKXoXOu38LV24wR+Av9+3zPXl89DHhbt72P6KSTYErqr6VZW/qCZh7pjiFsoIZjZct',
- 'SHA256': 'SHA256:CtOLkhSF+Bj3gLt0ihzV+Q/R9KfPsVsC6MkyLMOZov8',
- }
-}