Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • noblogs/noblogs-composer
1 result
Show changes
Commits on Source (9)
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 6a399e3a
include: "https://git.autistici.org/ai3/build-container/raw/master/common.yml"
# test the newly built container before releasing it.
stages:
- build
- test
- release
test:
stage: test
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/debian:stable
services:
- name: ${IMAGE_TAG}
alias: noblogs
- name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/mysql:latest
alias: mysql
variables:
APACHE_PORT: 8080
SITE_URL: "http://noblogs:8080"
MYSQL_DATABASE: noblogstest
MYSQL_ROOT_PASSWORD: changeme
PHP_FPM_USER: www-data
script:
- apt -q update
- env DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install curl
- "curl -H 'Host: noblogs.org' -v ${SITE_URL}"
Dockerfile
View file @ 6a399e3a
......@@ -17,3 +17,6 @@ COPY docker/post-upgrade.sh /post-upgrade.sh
RUN /tmp/build.sh && rm /tmp/build.sh
# For testing purposes (8080 is the default port of apache2-php-base).
EXPOSE 8080/tcp
composer.lock
View file @ 6a399e3a
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "152d3554ed14f9928188a93d80db03d7",
"content-hash": "bbc6125c5da28f0621c64076a7222d88",
"packages": [
{
"name": "bjornjohansen/wplang",
......@@ -296,15 +296,6 @@
"wordpress/core-implementation": "5.8.1"
},
"type": "wordpress-core",
"extra": {
"patches_applied": {
"Patch definition of WP_CONTENT_URL to include SSL when it might not ": "patches/core/0052-fix-ssl-wp-content-url.patch",
"Anonymize requests to api.wordpress.org for updates": "patches/core/anonymize-update.php.patch",
"Do not perform pingbacks and trackbacks when we update via cron": "patches/core/0103-Remove-pingback-trackback.patch",
"Load JS library locally instead than from Googleapis": "patches/core/0155-Removing-reference-to-googleapis-from-wp-includes-up.patch",
"Remove Google Fonts API calls": "patches/core/0165-remove-google-fonts.patch"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
......@@ -446,16 +437,16 @@
},
{
"name": "noblogs/ai-global-activity-plugin",
"version": "0.0.15",
"version": "0.0.17",
"source": {
"type": "git",
"url": "https://git.autistici.org/noblogs/ai-global-activity-plugin.git",
"reference": "3a39a7e7d702000f1a0c0541e6987c688aa8d8e8"
"reference": "62ba8afcfb3ffd1385148adedf17fa6799097856"
},
"dist": {
"type": "zip",
"url": "https://git.autistici.org/api/v4/projects/485/packages/composer/archives/noblogs/ai-global-activity-plugin.zip?sha=3a39a7e7d702000f1a0c0541e6987c688aa8d8e8",
"reference": "3a39a7e7d702000f1a0c0541e6987c688aa8d8e8",
"url": "https://git.autistici.org/api/v4/projects/485/packages/composer/archives/noblogs/ai-global-activity-plugin.zip?sha=62ba8afcfb3ffd1385148adedf17fa6799097856",
"reference": "62ba8afcfb3ffd1385148adedf17fa6799097856",
"shasum": ""
},
"require": {
......@@ -879,12 +870,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-plugin",
"extra": {
"patches_applied": {
"Disable gravatar": "patches/buddypress/0053-Patch-buddypress.patch",
"Force https on buddypress login redirect": "patches/buddypress/0147-forced-https-on-buddypress-login-redirect.patch"
}
},
"homepage": "https://wordpress.org/plugins/buddypress/"
},
{
......@@ -993,11 +978,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-plugin",
"extra": {
"patches_applied": {
"Run update checks during cron": "patches/plugins/disable-wordpress-updates.patch"
}
},
"homepage": "https://wordpress.org/plugins/disable-wordpress-updates/"
},
{
......@@ -1142,11 +1122,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-plugin",
"extra": {
"patches_applied": {
"Do send mail on privacy setting change": "patches/plugins/more-privacy-options.patch"
}
},
"homepage": "https://wordpress.org/plugins/more-privacy-options/"
},
{
......@@ -1219,11 +1194,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-plugin",
"extra": {
"patches_applied": {
"Small workaround to fix simplyexclude plugin broken with wordpress 4": "patches/plugins/0117-simplyexclude.patch"
}
},
"homepage": "https://wordpress.org/plugins/simply-exclude/"
},
{
......@@ -1332,11 +1302,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-plugin",
"extra": {
"patches_applied": {
"Disable Piwik global updates": "patches/plugins/wp-piwik.patch"
}
},
"homepage": "https://wordpress.org/plugins/wp-piwik/"
},
{
......@@ -1355,11 +1320,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-plugin",
"extra": {
"patches_applied": {
"Support for global recaptcha keys": "patches/plugins/wp-recaptcha-bp.patch"
}
},
"homepage": "https://wordpress.org/plugins/wp-recaptcha-bp/"
},
{
......@@ -1486,11 +1446,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Teme footer": "patches/themes/0056-Patch-theme-azul.patch"
}
},
"homepage": "https://wordpress.org/themes/azul/"
},
{
......@@ -1527,11 +1482,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0223-bliss-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/bliss/"
},
{
......@@ -1550,11 +1500,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0057-Patch-theme-carrington-blog.patch"
}
},
"homepage": "https://wordpress.org/themes/carrington-blog/"
},
{
......@@ -1573,11 +1518,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0058-Patch-theme-classic.patch"
}
},
"homepage": "https://wordpress.org/themes/classic/"
},
{
......@@ -1596,11 +1536,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0062-Patch-theme-default.patch"
}
},
"homepage": "https://wordpress.org/themes/default/"
},
{
......@@ -1619,11 +1554,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0063-Patch-theme-disconnected.patch"
}
},
"homepage": "https://wordpress.org/themes/disconnected/"
},
{
......@@ -1642,11 +1572,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0064-Patch-theme-elegant-grunge.patch"
}
},
"homepage": "https://wordpress.org/themes/elegant-grunge/"
},
{
......@@ -1665,11 +1590,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0065-Patch-theme-fixed-blix.patch"
}
},
"homepage": "https://wordpress.org/themes/fixed-blix/"
},
{
......@@ -1688,11 +1608,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0067-Patch-theme-fresh-editorial.patch"
}
},
"homepage": "https://wordpress.org/themes/fresh-editorial/"
},
{
......@@ -1711,11 +1626,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0069-Patch-theme-gone-fishing.patch"
}
},
"homepage": "https://wordpress.org/themes/gone-fishing/"
},
{
......@@ -1788,11 +1698,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/themes-minimalism.patch"
}
},
"homepage": "https://wordpress.org/themes/minimalism/"
},
{
......@@ -1811,11 +1716,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0073-Patch-theme-mnml.patch"
}
},
"homepage": "https://wordpress.org/themes/mnml/"
},
{
......@@ -1834,11 +1734,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0077-Patch-theme-ocular-professor.patch"
}
},
"homepage": "https://wordpress.org/themes/ocular-professor/"
},
{
......@@ -1857,11 +1752,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0079-Patch-theme-primepress.patch"
}
},
"homepage": "https://wordpress.org/themes/primepress/"
},
{
......@@ -1880,11 +1770,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0080-Patch-theme-rusty-grunge.patch"
}
},
"homepage": "https://wordpress.org/themes/rusty-grunge/"
},
{
......@@ -1921,11 +1806,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0083-Patch-theme-simplex.patch"
}
},
"homepage": "https://wordpress.org/themes/simplex/"
},
{
......@@ -1962,11 +1842,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0084-Patch-theme-tanzaku.patch"
}
},
"homepage": "https://wordpress.org/themes/tanzaku/"
},
{
......@@ -1985,11 +1860,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0085-Patch-theme-the-scenery.patch"
}
},
"homepage": "https://wordpress.org/themes/the-scenery/"
},
{
......@@ -2008,11 +1878,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0223-thematic-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/thematic/"
},
{
......@@ -2031,11 +1896,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0086-Patch-theme-threattocreativity.patch"
}
},
"homepage": "https://wordpress.org/themes/threattocreativity/"
},
{
......@@ -2054,11 +1914,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0165-twentyeleven-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyeleven/"
},
{
......@@ -2077,11 +1932,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0187-twentyfifteen.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyfifteen/"
},
{
......@@ -2100,11 +1950,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0187-twentyfourteen.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyfourteen/"
},
{
......@@ -2120,7 +1965,7 @@
"url": "https://downloads.wordpress.org/theme/twentynineteen.2.1.zip"
},
"require": {
"composer/installers": "~1.0"
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"homepage": "https://wordpress.org/themes/twentynineteen/"
......@@ -2159,11 +2004,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0223-twentysixteen-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentysixteen/"
},
{
......@@ -2182,11 +2022,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0187-twentyten.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyten/"
},
{
......@@ -2205,11 +2040,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0165-twentythirteen-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentythirteen/"
},
{
......@@ -2228,11 +2058,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0165-twentytwelve-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentytwelve/"
},
{
......@@ -2248,7 +2073,7 @@
"url": "https://downloads.wordpress.org/theme/twentytwenty.1.8.zip"
},
"require": {
"composer/installers": "~1.0"
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"homepage": "https://wordpress.org/themes/twentytwenty/"
......@@ -2269,11 +2094,6 @@
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0090-Patch-theme-wp-andreas01.patch"
}
},
"homepage": "https://wordpress.org/themes/wp-andreas01/"
},
{
......
docker/conf/php/7.3/fpm/pool.d/www.conf
View file @ 6a399e3a
[www]
user = ${PHP_FPM_USER}
listen = /run/php/php7.3-fpm.sock
pm = dynamic
......
docker/wp-config.php
View file @ 6a399e3a
......@@ -4,8 +4,38 @@
* First of all, read our own configuration file.
*
* Store the result in an associative array '$noblogs_config'.
*
* If the configuration file does not exist, start with a testing
* configuration that is meant to work with our CI.
*/
$noblogs_config = json_decode(file_get_contents('/etc/noblogs/config.json'), true);
$noblogs_config = array(
"secrets" => array(
"auth_key" => "testkey",
"secure_auth_key" => "testkey",
"logged_in_key" => "testkey",
"nonce_key" => "testkey",
"auth_salt" => "testkey",
"secure_auth_salt" => "testkey",
"logged_in_salt" => "testkey",
"nonce_salt" => "testkey"
),
"db_config" => array(
"backends" => array(
"default" => array(
"host" => "mysql",
"port" => "3306",
"name" => getenv("MYSQL_DATABASE"),
"user" => "root",
"password" => getenv("MYSQL_ROOT_PASSWORD")
)
)
)
);
$noblogs_config_json = file_get_contents('/etc/noblogs/config.json');
if ($noblogs_config_json) {
$noblogs_config = json_decode($noblogs_config_json, true);
}
/**
* The base configurations of the WordPress.
......