aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README2
l---------conf-enabled/javascript-common.conf1
-rw-r--r--git-redirects/aosp-mirror.conf34
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, 63 insertions, 20 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 d1cf699..546d67d 100644
--- a/git-redirects/aosp-mirror.conf
+++ b/git-redirects/aosp-mirror.conf
@@ -38,11 +38,11 @@ Redirect /mirrors/AOSP/device/generic/x86 /mirrors/AOSP/device_generic_x86
Redirect /mirrors/AOSP/device/google/accessory/arduino /mirrors/AOSP/device_google_accessory_arduino
Redirect /mirrors/AOSP/device/google/accessory/demokit /mirrors/AOSP/device_google_accessory_demokit
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_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
@@ -119,7 +119,7 @@ Redirect /mirrors/AOSP/platform/external/cmockery /mirrors/AOSP/platform_ex
Redirect /mirrors/AOSP/platform/external/cn-cbor /mirrors/AOSP/platform_external_cn-cbor
Redirect /mirrors/AOSP/platform/external/compiler-rt /mirrors/AOSP/platform_external_compiler-rt
Redirect /mirrors/AOSP/platform/external/conscrypt /mirrors/AOSP/platform_external_conscrypt
-Redirect /mirrors/AOSP/platform/external/cpu/features /mirrors/AOSP/platform_external_cpu_features
+Redirect /mirrors/AOSP/platform/external/cpu_features /mirrors/AOSP/platform_external_cpu_features
Redirect /mirrors/AOSP/platform/external/cpuinfo /mirrors/AOSP/platform_external_cpuinfo
Redirect /mirrors/AOSP/platform/external/crcalc /mirrors/AOSP/platform_external_crcalc
Redirect /mirrors/AOSP/platform/external/cros/system_api /mirrors/AOSP/platform_external_cros_system_api
@@ -204,7 +204,7 @@ Redirect /mirrors/AOSP/platform/external/grpc-grpc-java /mirrors/AOSP/platf
Redirect /mirrors/AOSP/platform/external/gtest /mirrors/AOSP/platform_external_gtest
Redirect /mirrors/AOSP/platform/external/guava /mirrors/AOSP/platform_external_guava
Redirect /mirrors/AOSP/platform/external/guice /mirrors/AOSP/platform_external_guice
-Redirect /mirrors/AOSP/platform/external/gwp/asan /mirrors/AOSP/platform_external_gwp_asan
+Redirect /mirrors/AOSP/platform/external/gwp_asan /mirrors/AOSP/platform_external_gwp_asan
Redirect /mirrors/AOSP/platform/external/hamcrest /mirrors/AOSP/platform_external_hamcrest
Redirect /mirrors/AOSP/platform/external/harfbuzz_ng /mirrors/AOSP/platform_external_harfbuzz_ng
Redirect /mirrors/AOSP/platform/external/honggfuzz /mirrors/AOSP/platform_external_honggfuzz
@@ -383,7 +383,7 @@ Redirect /mirrors/AOSP/platform/external/python/httplib2 /mirrors/AOSP/platf
Redirect /mirrors/AOSP/platform/external/python/ipaddress /mirrors/AOSP/platform_external_python_ipaddress
Redirect /mirrors/AOSP/platform/external/python/mock /mirrors/AOSP/platform_external_python_mock
Redirect /mirrors/AOSP/platform/external/python/oauth2client /mirrors/AOSP/platform_external_python_oauth2client
-Redirect /mirrors/AOSP/platform/external/python/parse/type /mirrors/AOSP/platform_external_python_parse_type
+Redirect /mirrors/AOSP/platform/external/python/parse_type /mirrors/AOSP/platform_external_python_parse_type
Redirect /mirrors/AOSP/platform/external/python/pyasn1 /mirrors/AOSP/platform_external_python_pyasn1
Redirect /mirrors/AOSP/platform/external/python/pyasn1-modules /mirrors/AOSP/platform_external_python_pyasn1-modules
Redirect /mirrors/AOSP/platform/external/python/pybind11 /mirrors/AOSP/platform_external_python_pybind11
@@ -493,7 +493,7 @@ Redirect /mirrors/AOSP/platform/frameworks/ex /mirrors/AOSP/platform_frame
Redirect /mirrors/AOSP/platform/frameworks/hardware/interfaces /mirrors/AOSP/platform_frameworks_hardware_interfaces
Redirect /mirrors/AOSP/platform/frameworks/layoutlib /mirrors/AOSP/platform_frameworks_layoutlib
Redirect /mirrors/AOSP/platform/frameworks/libs/modules-utils /mirrors/AOSP/platform_frameworks_libs_modules-utils
-Redirect /mirrors/AOSP/platform/frameworks/libs/native/bridge/support /mirrors/AOSP/platform_frameworks_libs_native_bridge_support
+Redirect /mirrors/AOSP/platform/frameworks/libs/native_bridge_support /mirrors/AOSP/platform_frameworks_libs_native_bridge_support
Redirect /mirrors/AOSP/platform/frameworks/libs/net /mirrors/AOSP/platform_frameworks_libs_net
Redirect /mirrors/AOSP/platform/frameworks/libs/systemui /mirrors/AOSP/platform_frameworks_libs_systemui
Redirect /mirrors/AOSP/platform/frameworks/minikin /mirrors/AOSP/platform_frameworks_minikin
@@ -539,9 +539,9 @@ Redirect /mirrors/AOSP/platform/hardware/intel/common/wrs/omxil/core /mirrors
Redirect /mirrors/AOSP/platform/hardware/intel/sensors /mirrors/AOSP/platform_hardware_intel_sensors
Redirect /mirrors/AOSP/platform/hardware/interfaces /mirrors/AOSP/platform_hardware_interfaces
Redirect /mirrors/AOSP/platform/hardware/invensense /mirrors/AOSP/platform_hardware_invensense
-Redirect /mirrors/AOSP/platform/hardware/knowles/athletico/sound/trigger/hal /mirrors/AOSP/platform_hardware_knowles_athletico_sound_trigger_hal
+Redirect /mirrors/AOSP/platform/hardware/knowles/athletico/sound_trigger_hal /mirrors/AOSP/platform_hardware_knowles_athletico_sound_trigger_hal
Redirect /mirrors/AOSP/platform/hardware/libhardware /mirrors/AOSP/platform_hardware_libhardware
-Redirect /mirrors/AOSP/platform/hardware/libhardware/legacy /mirrors/AOSP/platform_hardware_libhardware_legacy
+Redirect /mirrors/AOSP/platform/hardware/libhardware_legacy /mirrors/AOSP/platform_hardware_libhardware_legacy
Redirect /mirrors/AOSP/platform/hardware/marvell/bt /mirrors/AOSP/platform_hardware_marvell_bt
Redirect /mirrors/AOSP/platform/hardware/nxp/nfc /mirrors/AOSP/platform_hardware_nxp_nfc
Redirect /mirrors/AOSP/platform/hardware/nxp/secure_element /mirrors/AOSP/platform_hardware_nxp_secure_element
@@ -703,7 +703,7 @@ Redirect /mirrors/AOSP/platform/packages/services/Telephony /mirrors/AOSP/pl
Redirect /mirrors/AOSP/platform/packages/wallpapers/ImageWallpaper /mirrors/AOSP/platform_packages_wallpapers_ImageWallpaper
Redirect /mirrors/AOSP/platform/packages/wallpapers/LivePicker /mirrors/AOSP/platform_packages_wallpapers_LivePicker
Redirect /mirrors/AOSP/platform/pdk /mirrors/AOSP/platform_pdk
-Redirect /mirrors/AOSP/platform/platform/testing /mirrors/AOSP/platform_platform_testing
+Redirect /mirrors/AOSP/platform/platform_testing /mirrors/AOSP/platform_platform_testing
Redirect /mirrors/AOSP/platform/prebuilts/abi-dumps/ndk /mirrors/AOSP/platform_prebuilts_abi-dumps_ndk
Redirect /mirrors/AOSP/platform/prebuilts/abi-dumps/platform /mirrors/AOSP/platform_prebuilts_abi-dumps_platform
Redirect /mirrors/AOSP/platform/prebuilts/abi-dumps/vndk /mirrors/AOSP/platform_prebuilts_abi-dumps_vndk
@@ -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
@@ -776,7 +776,7 @@ Redirect /mirrors/AOSP/platform/system/gatekeeper /mirrors/AOSP/platform_sy
Redirect /mirrors/AOSP/platform/system/gsid /mirrors/AOSP/platform_system_gsid
Redirect /mirrors/AOSP/platform/system/hardware/interfaces /mirrors/AOSP/platform_system_hardware_interfaces
Redirect /mirrors/AOSP/platform/system/hwservicemanager /mirrors/AOSP/platform_system_hwservicemanager
-Redirect /mirrors/AOSP/platform/system/incremental/delivery /mirrors/AOSP/platform_system_incremental_delivery
+Redirect /mirrors/AOSP/platform/system/incremental_delivery /mirrors/AOSP/platform_system_incremental_delivery
Redirect /mirrors/AOSP/platform/system/iorap /mirrors/AOSP/platform_system_iorap
Redirect /mirrors/AOSP/platform/system/keymaster /mirrors/AOSP/platform_system_keymaster
Redirect /mirrors/AOSP/platform/system/libartpalette /mirrors/AOSP/platform_system_libartpalette
@@ -808,9 +808,9 @@ Redirect /mirrors/AOSP/platform/system/tools/mkbootimg /mirrors/AOSP/platfo
Redirect /mirrors/AOSP/platform/system/tools/sysprop /mirrors/AOSP/platform_system_tools_sysprop
Redirect /mirrors/AOSP/platform/system/tools/xsdc /mirrors/AOSP/platform_system_tools_xsdc
Redirect /mirrors/AOSP/platform/system/ucontainer /mirrors/AOSP/platform_system_ucontainer
-Redirect /mirrors/AOSP/platform/system/update/engine /mirrors/AOSP/platform_system_update_engine
+Redirect /mirrors/AOSP/platform/system/update_engine /mirrors/AOSP/platform_system_update_engine
Redirect /mirrors/AOSP/platform/system/vold /mirrors/AOSP/platform_system_vold
-Redirect /mirrors/AOSP/platform/test/app/compat/csuite /mirrors/AOSP/platform_test_app_compat_csuite
+Redirect /mirrors/AOSP/platform/test/app_compat/csuite /mirrors/AOSP/platform_test_app_compat_csuite
Redirect /mirrors/AOSP/platform/test/framework /mirrors/AOSP/platform_test_framework
Redirect /mirrors/AOSP/platform/test/mlts/benchmark /mirrors/AOSP/platform_test_mlts_benchmark
Redirect /mirrors/AOSP/platform/test/mlts/models /mirrors/AOSP/platform_test_mlts_models
@@ -836,10 +836,10 @@ Redirect /mirrors/AOSP/platform/tools/apkzlib /mirrors/AOSP/platform_tools
Redirect /mirrors/AOSP/platform/tools/asuite /mirrors/AOSP/platform_tools_asuite
Redirect /mirrors/AOSP/platform/tools/base /mirrors/AOSP/platform_tools_base
Redirect /mirrors/AOSP/platform/tools/build /mirrors/AOSP/platform_tools_build
-Redirect /mirrors/AOSP/platform/tools/carrier/settings /mirrors/AOSP/platform_tools_carrier_settings
+Redirect /mirrors/AOSP/platform/tools/carrier_settings /mirrors/AOSP/platform_tools_carrier_settings
Redirect /mirrors/AOSP/platform/tools/currysrc /mirrors/AOSP/platform_tools_currysrc
Redirect /mirrors/AOSP/platform/tools/dexter /mirrors/AOSP/platform_tools_dexter
-Redirect /mirrors/AOSP/platform/tools/doc/generation /mirrors/AOSP/platform_tools_doc_generation
+Redirect /mirrors/AOSP/platform/tools/doc_generation /mirrors/AOSP/platform_tools_doc_generation
Redirect /mirrors/AOSP/platform/tools/external/fat32lib /mirrors/AOSP/platform_tools_external_fat32lib
Redirect /mirrors/AOSP/platform/tools/external/gradle /mirrors/AOSP/platform_tools_external_gradle
Redirect /mirrors/AOSP/platform/tools/external_updater /mirrors/AOSP/platform_tools_external_updater
@@ -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-26 09:55:07 +0000