aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README2
l---------conf-enabled/javascript-common.conf1
-rw-r--r--git-redirects/aosp-mirror.conf8
l---------mods-enabled/mpm_event.conf1
l---------mods-enabled/mpm_event.load1
l---------mods-enabled/mpm_prefork.conf1
l---------mods-enabled/mpm_prefork.load1
l---------mods-enabled/reqtimeout.conf1
l---------mods-enabled/reqtimeout.load1
-rw-r--r--sites-available/blog.test.replicant.us-letsencrypt.conf8
-rw-r--r--sites-available/blog.test.replicant.us.conf26
-rw-r--r--sites-available/letsencrypt.conf5
l---------sites-enabled/blog.test.replicant.us.conf1
13 files changed, 50 insertions, 7 deletions
diff --git a/README b/README
index 0391ec8..29aa346 100644
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ necessary for fetching the Replicant source code:
integrate upstream's changes instead.
== Distributions ==
-Currently, Trisquel 8 is being used with that configuration.
+Currently, Trisquel 10 is being used with that configuration.
== License ==
The license of all the files is the AGPLv3 or later.
diff --git a/conf-enabled/javascript-common.conf b/conf-enabled/javascript-common.conf
new file mode 120000
index 0000000..0a4baa4
--- /dev/null
+++ b/conf-enabled/javascript-common.conf
@@ -0,0 +1 @@
+../conf-available/javascript-common.conf \ No newline at end of file
diff --git a/git-redirects/aosp-mirror.conf b/git-redirects/aosp-mirror.conf
index 890e657..546d67d 100644
--- a/git-redirects/aosp-mirror.conf
+++ b/git-redirects/aosp-mirror.conf
@@ -41,8 +41,8 @@ Redirect /mirrors/AOSP/device/google/atv /mirrors/AOSP/device_google_atv
Redirect /mirrors/AOSP/device/google_car /mirrors/AOSP/device_google_car
Redirect /mirrors/AOSP/device/google/contexthub /mirrors/AOSP/device_google_contexthub
Redirect /mirrors/AOSP/device/google/cuttlefish /mirrors/AOSP/device_google_cuttlefish
-Redirect /mirrors/AOSP/device/google/cuttlefish/kernel /mirrors/AOSP/device_google_cuttlefish_kernel
-Redirect /mirrors/AOSP/device/google/cuttlefish/vmm /mirrors/AOSP/device_google_cuttlefish_vmm
+Redirect /mirrors/AOSP/device/google/cuttlefish_kernel /mirrors/AOSP/device_google_cuttlefish_kernel
+Redirect /mirrors/AOSP/device/google/cuttlefish_vmm /mirrors/AOSP/device_google_cuttlefish_vmm
Redirect /mirrors/AOSP/device/google/fuchsia /mirrors/AOSP/device_google_fuchsia
Redirect /mirrors/AOSP/device/google/muskie /mirrors/AOSP/device_google_muskie
Redirect /mirrors/AOSP/device/google/taimen /mirrors/AOSP/device_google_taimen
@@ -746,7 +746,7 @@ Redirect /mirrors/AOSP/platform/prebuilts/manifest-merger /mirrors/AOSP/plat
Redirect /mirrors/AOSP/platform/prebuilts/maven_repo/android /mirrors/AOSP/platform_prebuilts_maven_repo_android
Redirect /mirrors/AOSP/platform/prebuilts/maven_repo/bumptech /mirrors/AOSP/platform_prebuilts_maven_repo_bumptech
Redirect /mirrors/AOSP/platform/prebuilts/misc /mirrors/AOSP/platform_prebuilts_misc
-Redirect /mirrors/AOSP/platform/prebuilts/module/sdk/art /mirrors/AOSP/platform_prebuilts_module_sdk_art
+Redirect /mirrors/AOSP/platform/prebuilts/module_sdk/art /mirrors/AOSP/platform_prebuilts_module_sdk_art
Redirect /mirrors/AOSP/platform/prebuilts/ndk /mirrors/AOSP/platform_prebuilts_ndk
Redirect /mirrors/AOSP/platform/prebuilts/python/darwin-x86/2.7.5 /mirrors/AOSP/platform_prebuilts_python_darwin-x86_2.7.5
Redirect /mirrors/AOSP/platform/prebuilts/python/linux-x86/2.7.5 /mirrors/AOSP/platform_prebuilts_python_linux-x86_2.7.5
@@ -860,4 +860,4 @@ Redirect /mirrors/AOSP/platform/tools/treble /mirrors/AOSP/platform_tools_
Redirect /mirrors/AOSP/platform/tools/trebuchet /mirrors/AOSP/platform_tools_trebuchet
Redirect /mirrors/AOSP/toolchain/benchmark /mirrors/AOSP/toolchain_benchmark
Redirect /mirrors/AOSP/toolchain/pgo-profiles /mirrors/AOSP/toolchain_pgo-profiles
-Redirect /mirrors/AOSP/tools/platform-compat /mirrors/AOSP/tools_platform-compat \ No newline at end of file
+Redirect /mirrors/AOSP/tools/platform-compat /mirrors/AOSP/tools_platform-compat
diff --git a/mods-enabled/mpm_event.conf b/mods-enabled/mpm_event.conf
deleted file mode 120000
index fdbe68a..0000000
--- a/mods-enabled/mpm_event.conf
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/mpm_event.conf \ No newline at end of file
diff --git a/mods-enabled/mpm_event.load b/mods-enabled/mpm_event.load
deleted file mode 120000
index c1e41c1..0000000
--- a/mods-enabled/mpm_event.load
+++ /dev/null
@@ -1 +0,0 @@
-../mods-available/mpm_event.load \ No newline at end of file
diff --git a/mods-enabled/mpm_prefork.conf b/mods-enabled/mpm_prefork.conf
new file mode 120000
index 0000000..85c1baa
--- /dev/null
+++ b/mods-enabled/mpm_prefork.conf
@@ -0,0 +1 @@
+../mods-available/mpm_prefork.conf \ No newline at end of file
diff --git a/mods-enabled/mpm_prefork.load b/mods-enabled/mpm_prefork.load
new file mode 120000
index 0000000..f61ace3
--- /dev/null
+++ b/mods-enabled/mpm_prefork.load
@@ -0,0 +1 @@
+../mods-available/mpm_prefork.load \ No newline at end of file
diff --git a/mods-enabled/reqtimeout.conf b/mods-enabled/reqtimeout.conf
new file mode 120000
index 0000000..093b41d
--- /dev/null
+++ b/mods-enabled/reqtimeout.conf
@@ -0,0 +1 @@
+../mods-available/reqtimeout.conf \ No newline at end of file
diff --git a/mods-enabled/reqtimeout.load b/mods-enabled/reqtimeout.load
new file mode 120000
index 0000000..979fab9
--- /dev/null
+++ b/mods-enabled/reqtimeout.load
@@ -0,0 +1 @@
+../mods-available/reqtimeout.load \ No newline at end of file
diff --git a/sites-available/blog.test.replicant.us-letsencrypt.conf b/sites-available/blog.test.replicant.us-letsencrypt.conf
new file mode 100644
index 0000000..1624047
--- /dev/null
+++ b/sites-available/blog.test.replicant.us-letsencrypt.conf
@@ -0,0 +1,8 @@
+# This file is only meant to be used to get the very first letsencrypt
+# certificate, and before the final letsencrypt or apache
+# configuration are deployed.
+<VirtualHost *:80>
+ ServerName blog.test.replicant.us
+ DocumentRoot /var/www/blog.test.replicant.us
+</VirtualHost>
+
diff --git a/sites-available/blog.test.replicant.us.conf b/sites-available/blog.test.replicant.us.conf
new file mode 100644
index 0000000..e2dab9b
--- /dev/null
+++ b/sites-available/blog.test.replicant.us.conf
@@ -0,0 +1,26 @@
+# Usage:
+# This virtual host is meant to be used to deploy a configuration file
+# for the email service that is currently using the autoconfig.replicant.us address
+<VirtualHost *:80>
+ ServerName blog.test.replicant.us
+ RewriteEngine On
+ RewriteCond %{HTTPS} off
+ RewriteCond %{REMOTE_ADDR} !=127.0.0.1
+ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+</VirtualHost>
+
+<IfModule mod_ssl.c>
+ <VirtualHost *:443>
+ ServerAdmin contact@replicant.us
+ ServerName blog.test.replicant.us
+
+ DocumentRoot /var/www/blog.test.replicant.us
+
+ Header always set Strict-Transport-Security "max-age=31536000;"
+
+ SSLEngine On
+ SSLCertificateFile /etc/letsencrypt/live/blog.test.replicant.us/cert.pem
+ SSLCertificateChainFile /etc/letsencrypt/live/blog.test.replicant.us/chain.pem
+ SSLCertificateKeyFile /etc/letsencrypt/live/blog.test.replicant.us/privkey.pem
+ </VirtualHost>
+</IfModule>
diff --git a/sites-available/letsencrypt.conf b/sites-available/letsencrypt.conf
index a00a1bf..8e127cd 100644
--- a/sites-available/letsencrypt.conf
+++ b/sites-available/letsencrypt.conf
@@ -8,3 +8,8 @@
ServerName mx1.replicant.us
DocumentRoot /var/www/letsencrypt/mx1.replicant.us/
</VirtualHost>
+
+<VirtualHost *:80>
+ ServerName blog.test.replicant.us
+ DocumentRoot /var/www/letsencrypt/blog.test.replicant.us/
+</VirtualHost>
diff --git a/sites-enabled/blog.test.replicant.us.conf b/sites-enabled/blog.test.replicant.us.conf
new file mode 120000
index 0000000..7a3f709
--- /dev/null
+++ b/sites-enabled/blog.test.replicant.us.conf
@@ -0,0 +1 @@
+../sites-available/blog.test.replicant.us.conf \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 06:52:24 +0000