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 (5)
Hide whitespace changes
Inline Side-by-side
Showing
with 246 additions and 94 deletions
Dockerfile
View file @ e47bff27
...@@ -4,7 +4,7 @@ ADD . /build ...@@ -4,7 +4,7 @@ ADD . /build
WORKDIR /build WORKDIR /build
RUN /build/install.sh RUN /build/install.sh
FROM registry.git.autistici.org/ai3/docker/apache2-php-base:master FROM registry.git.autistici.org/ai3/docker/apache2-php-base:s6
COPY --from=build /build/app/ /opt/noblogs/www COPY --from=build /build/app/ /opt/noblogs/www
...@@ -13,7 +13,6 @@ COPY docker/wp-config.php /opt/noblogs/www/wp-config.php ...@@ -13,7 +13,6 @@ COPY docker/wp-config.php /opt/noblogs/www/wp-config.php
COPY docker/wp-cache-config.php /opt/noblogs/www/wp-content/wp-cache-config.php COPY docker/wp-cache-config.php /opt/noblogs/www/wp-content/wp-cache-config.php
COPY docker/conf /tmp/conf COPY docker/conf /tmp/conf
COPY docker/build.sh /tmp/build.sh COPY docker/build.sh /tmp/build.sh
COPY docker/post-upgrade.sh /post-upgrade.sh
RUN /tmp/build.sh && rm /tmp/build.sh RUN /tmp/build.sh && rm /tmp/build.sh
......
composer.lock
View file @ e47bff27
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "bbc6125c5da28f0621c64076a7222d88", "content-hash": "c8539e50e9864bec52df098d8fed259e",
"packages": [ "packages": [
{ {
"name": "bjornjohansen/wplang", "name": "bjornjohansen/wplang",
...@@ -296,6 +296,15 @@ ...@@ -296,6 +296,15 @@
"wordpress/core-implementation": "5.8.1" "wordpress/core-implementation": "5.8.1"
}, },
"type": "wordpress-core", "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/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"GPL-2.0-or-later" "GPL-2.0-or-later"
...@@ -661,16 +670,16 @@ ...@@ -661,16 +670,16 @@
}, },
{ {
"name": "noblogs/themes-child", "name": "noblogs/themes-child",
"version": "0.2.0", "version": "0.3.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.autistici.org/noblogs/themes-child.git", "url": "https://git.autistici.org/noblogs/themes-child.git",
"reference": "fb4c93e10f40641078119b3f5968d58c6daa4805" "reference": "720e481377c8dfd19126a570b9293fe181ef4e1e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://git.autistici.org/api/v4/projects/464/packages/composer/archives/noblogs/themes-child.zip?sha=fb4c93e10f40641078119b3f5968d58c6daa4805", "url": "https://git.autistici.org/api/v4/projects/464/packages/composer/archives/noblogs/themes-child.zip?sha=720e481377c8dfd19126a570b9293fe181ef4e1e",
"reference": "fb4c93e10f40641078119b3f5968d58c6daa4805", "reference": "720e481377c8dfd19126a570b9293fe181ef4e1e",
"shasum": "" "shasum": ""
}, },
"type": "project", "type": "project",
...@@ -870,6 +879,12 @@ ...@@ -870,6 +879,12 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-plugin", "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/" "homepage": "https://wordpress.org/plugins/buddypress/"
}, },
{ {
...@@ -978,6 +993,11 @@ ...@@ -978,6 +993,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-plugin", "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/" "homepage": "https://wordpress.org/plugins/disable-wordpress-updates/"
}, },
{ {
...@@ -1122,6 +1142,11 @@ ...@@ -1122,6 +1142,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-plugin", "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/" "homepage": "https://wordpress.org/plugins/more-privacy-options/"
}, },
{ {
...@@ -1194,6 +1219,11 @@ ...@@ -1194,6 +1219,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-plugin", "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/" "homepage": "https://wordpress.org/plugins/simply-exclude/"
}, },
{ {
...@@ -1302,6 +1332,11 @@ ...@@ -1302,6 +1332,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-plugin", "type": "wordpress-plugin",
"extra": {
"patches_applied": {
"Disable Piwik global updates": "patches/plugins/wp-piwik.patch"
}
},
"homepage": "https://wordpress.org/plugins/wp-piwik/" "homepage": "https://wordpress.org/plugins/wp-piwik/"
}, },
{ {
...@@ -1320,6 +1355,11 @@ ...@@ -1320,6 +1355,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-plugin", "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/" "homepage": "https://wordpress.org/plugins/wp-recaptcha-bp/"
}, },
{ {
...@@ -1446,25 +1486,12 @@ ...@@ -1446,25 +1486,12 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"homepage": "https://wordpress.org/themes/azul/" "extra": {
}, "patches_applied": {
{ "Teme footer": "patches/themes/0056-Patch-theme-azul.patch"
"name": "wpackagist-theme/blank-canvas", }
"version": "1.2.9",
"source": {
"type": "svn",
"url": "https://themes.svn.wordpress.org/blank-canvas/",
"reference": "1.2.9"
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/theme/blank-canvas.1.2.9.zip"
},
"require": {
"composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "homepage": "https://wordpress.org/themes/azul/"
"homepage": "https://wordpress.org/themes/blank-canvas/"
}, },
{ {
"name": "wpackagist-theme/bliss", "name": "wpackagist-theme/bliss",
...@@ -1482,6 +1509,11 @@ ...@@ -1482,6 +1509,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0223-bliss-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/bliss/" "homepage": "https://wordpress.org/themes/bliss/"
}, },
{ {
...@@ -1500,6 +1532,11 @@ ...@@ -1500,6 +1532,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0057-Patch-theme-carrington-blog.patch"
}
},
"homepage": "https://wordpress.org/themes/carrington-blog/" "homepage": "https://wordpress.org/themes/carrington-blog/"
}, },
{ {
...@@ -1518,6 +1555,11 @@ ...@@ -1518,6 +1555,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0058-Patch-theme-classic.patch"
}
},
"homepage": "https://wordpress.org/themes/classic/" "homepage": "https://wordpress.org/themes/classic/"
}, },
{ {
...@@ -1536,6 +1578,11 @@ ...@@ -1536,6 +1578,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0062-Patch-theme-default.patch"
}
},
"homepage": "https://wordpress.org/themes/default/" "homepage": "https://wordpress.org/themes/default/"
}, },
{ {
...@@ -1554,6 +1601,11 @@ ...@@ -1554,6 +1601,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0063-Patch-theme-disconnected.patch"
}
},
"homepage": "https://wordpress.org/themes/disconnected/" "homepage": "https://wordpress.org/themes/disconnected/"
}, },
{ {
...@@ -1572,8 +1624,31 @@ ...@@ -1572,8 +1624,31 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0064-Patch-theme-elegant-grunge.patch"
}
},
"homepage": "https://wordpress.org/themes/elegant-grunge/" "homepage": "https://wordpress.org/themes/elegant-grunge/"
}, },
{
"name": "wpackagist-theme/enjoyblog",
"version": "1.0.1",
"source": {
"type": "svn",
"url": "https://themes.svn.wordpress.org/enjoyblog/",
"reference": "1.0.1"
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/theme/enjoyblog.1.0.1.zip"
},
"require": {
"composer/installers": "~1.0 || ~2.0"
},
"type": "wordpress-theme",
"homepage": "https://wordpress.org/themes/enjoyblog/"
},
{ {
"name": "wpackagist-theme/fixed-blix", "name": "wpackagist-theme/fixed-blix",
"version": "2009.08.13", "version": "2009.08.13",
...@@ -1590,6 +1665,11 @@ ...@@ -1590,6 +1665,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0065-Patch-theme-fixed-blix.patch"
}
},
"homepage": "https://wordpress.org/themes/fixed-blix/" "homepage": "https://wordpress.org/themes/fixed-blix/"
}, },
{ {
...@@ -1608,6 +1688,11 @@ ...@@ -1608,6 +1688,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0067-Patch-theme-fresh-editorial.patch"
}
},
"homepage": "https://wordpress.org/themes/fresh-editorial/" "homepage": "https://wordpress.org/themes/fresh-editorial/"
}, },
{ {
...@@ -1626,6 +1711,11 @@ ...@@ -1626,6 +1711,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0069-Patch-theme-gone-fishing.patch"
}
},
"homepage": "https://wordpress.org/themes/gone-fishing/" "homepage": "https://wordpress.org/themes/gone-fishing/"
}, },
{ {
...@@ -1698,6 +1788,11 @@ ...@@ -1698,6 +1788,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/themes-minimalism.patch"
}
},
"homepage": "https://wordpress.org/themes/minimalism/" "homepage": "https://wordpress.org/themes/minimalism/"
}, },
{ {
...@@ -1716,6 +1811,11 @@ ...@@ -1716,6 +1811,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0073-Patch-theme-mnml.patch"
}
},
"homepage": "https://wordpress.org/themes/mnml/" "homepage": "https://wordpress.org/themes/mnml/"
}, },
{ {
...@@ -1734,6 +1834,11 @@ ...@@ -1734,6 +1834,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0077-Patch-theme-ocular-professor.patch"
}
},
"homepage": "https://wordpress.org/themes/ocular-professor/" "homepage": "https://wordpress.org/themes/ocular-professor/"
}, },
{ {
...@@ -1752,6 +1857,11 @@ ...@@ -1752,6 +1857,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0079-Patch-theme-primepress.patch"
}
},
"homepage": "https://wordpress.org/themes/primepress/" "homepage": "https://wordpress.org/themes/primepress/"
}, },
{ {
...@@ -1770,6 +1880,11 @@ ...@@ -1770,6 +1880,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0080-Patch-theme-rusty-grunge.patch"
}
},
"homepage": "https://wordpress.org/themes/rusty-grunge/" "homepage": "https://wordpress.org/themes/rusty-grunge/"
}, },
{ {
...@@ -1806,25 +1921,12 @@ ...@@ -1806,25 +1921,12 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"homepage": "https://wordpress.org/themes/simplex/" "extra": {
}, "patches_applied": {
{ "Theme footer": "patches/themes/0083-Patch-theme-simplex.patch"
"name": "wpackagist-theme/spearhead", }
"version": "1.2.5",
"source": {
"type": "svn",
"url": "https://themes.svn.wordpress.org/spearhead/",
"reference": "1.2.5"
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/theme/spearhead.1.2.5.zip"
},
"require": {
"composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "homepage": "https://wordpress.org/themes/simplex/"
"homepage": "https://wordpress.org/themes/spearhead/"
}, },
{ {
"name": "wpackagist-theme/tanzaku", "name": "wpackagist-theme/tanzaku",
...@@ -1842,6 +1944,11 @@ ...@@ -1842,6 +1944,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0084-Patch-theme-tanzaku.patch"
}
},
"homepage": "https://wordpress.org/themes/tanzaku/" "homepage": "https://wordpress.org/themes/tanzaku/"
}, },
{ {
...@@ -1860,6 +1967,11 @@ ...@@ -1860,6 +1967,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0085-Patch-theme-the-scenery.patch"
}
},
"homepage": "https://wordpress.org/themes/the-scenery/" "homepage": "https://wordpress.org/themes/the-scenery/"
}, },
{ {
...@@ -1878,6 +1990,11 @@ ...@@ -1878,6 +1990,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0223-thematic-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/thematic/" "homepage": "https://wordpress.org/themes/thematic/"
}, },
{ {
...@@ -1896,6 +2013,11 @@ ...@@ -1896,6 +2013,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0086-Patch-theme-threattocreativity.patch"
}
},
"homepage": "https://wordpress.org/themes/threattocreativity/" "homepage": "https://wordpress.org/themes/threattocreativity/"
}, },
{ {
...@@ -1914,6 +2036,11 @@ ...@@ -1914,6 +2036,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0165-twentyeleven-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyeleven/" "homepage": "https://wordpress.org/themes/twentyeleven/"
}, },
{ {
...@@ -1932,6 +2059,11 @@ ...@@ -1932,6 +2059,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0187-twentyfifteen.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyfifteen/" "homepage": "https://wordpress.org/themes/twentyfifteen/"
}, },
{ {
...@@ -1950,6 +2082,11 @@ ...@@ -1950,6 +2082,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0187-twentyfourteen.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyfourteen/" "homepage": "https://wordpress.org/themes/twentyfourteen/"
}, },
{ {
...@@ -1965,7 +2102,7 @@ ...@@ -1965,7 +2102,7 @@
"url": "https://downloads.wordpress.org/theme/twentynineteen.2.1.zip" "url": "https://downloads.wordpress.org/theme/twentynineteen.2.1.zip"
}, },
"require": { "require": {
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"homepage": "https://wordpress.org/themes/twentynineteen/" "homepage": "https://wordpress.org/themes/twentynineteen/"
...@@ -2004,6 +2141,11 @@ ...@@ -2004,6 +2141,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0223-twentysixteen-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentysixteen/" "homepage": "https://wordpress.org/themes/twentysixteen/"
}, },
{ {
...@@ -2022,6 +2164,11 @@ ...@@ -2022,6 +2164,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0187-twentyten.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyten/" "homepage": "https://wordpress.org/themes/twentyten/"
}, },
{ {
...@@ -2040,6 +2187,11 @@ ...@@ -2040,6 +2187,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0165-twentythirteen-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentythirteen/" "homepage": "https://wordpress.org/themes/twentythirteen/"
}, },
{ {
...@@ -2058,6 +2210,11 @@ ...@@ -2058,6 +2210,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Footer credits": "patches/themes/0165-twentytwelve-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentytwelve/" "homepage": "https://wordpress.org/themes/twentytwelve/"
}, },
{ {
...@@ -2073,7 +2230,7 @@ ...@@ -2073,7 +2230,7 @@
"url": "https://downloads.wordpress.org/theme/twentytwenty.1.8.zip" "url": "https://downloads.wordpress.org/theme/twentytwenty.1.8.zip"
}, },
"require": { "require": {
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"homepage": "https://wordpress.org/themes/twentytwenty/" "homepage": "https://wordpress.org/themes/twentytwenty/"
...@@ -2094,6 +2251,11 @@ ...@@ -2094,6 +2251,11 @@
"composer/installers": "~1.0 || ~2.0" "composer/installers": "~1.0 || ~2.0"
}, },
"type": "wordpress-theme", "type": "wordpress-theme",
"extra": {
"patches_applied": {
"Theme footer": "patches/themes/0090-Patch-theme-wp-andreas01.patch"
}
},
"homepage": "https://wordpress.org/themes/wp-andreas01/" "homepage": "https://wordpress.org/themes/wp-andreas01/"
}, },
{ {
......
docker/conf/chaperone.d/clean-sessions.service deleted 100644 → 0
View file @ 6a399e3a
clean_sessions.service: {
type: cron,
interval: "10,40 * * * *",
command: "/usr/bin/find /var/lib/php/sessions -mindepth 1 -type f -mtime +1 -delete",
}
docker/conf/chaperone.d/startup.conf deleted 100644 → 0
View file @ 6a399e3a
noblogs_upgrade.service: {
type: oneshot,
stdout: inherit,
command: "/post-upgrade.sh",
ignore_failures: true,
process_timeout: 7200,
exit_kills: false,
}
docker/post-upgrade.sh → docker/conf/cont-init.d/99noblogs-post-upgrade
View file @ e47bff27
...@@ -44,4 +44,4 @@ if [ $cur_schema_version -lt $new_schema_version ]; then ...@@ -44,4 +44,4 @@ if [ $cur_schema_version -lt $new_schema_version ]; then
echo "network upgrade message removed" echo "network upgrade message removed"
fi fi
exit 0 exit 0
\ No newline at end of file
docker/conf/modsecurity/crs/REQUEST-900-EXCLUSION-RULES-BEFORE-CRS.conf
View file @ e47bff27
...@@ -21,16 +21,7 @@ SecRule REQUEST_FILENAME "@endsWith /wp-admin/themes.php" \ ...@@ -21,16 +21,7 @@ SecRule REQUEST_FILENAME "@endsWith /wp-admin/themes.php" \
phase:2,\ phase:2,\
pass,\ pass,\
nolog,\ nolog,\
ctl:ruleRemoveTargetByTag=CRS;ARGS:newcontent" ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:newcontent"
# The ability to edit CSS triggers XSS rules when editing posts.
# Disable all CRS rules on the wp-json API endpoint.
SecRule REQUEST_URI "@beginsWith /wp-json/wp/v2/posts/" \
"id:1003,\
phase:2,\
pass,\
nolog,\
ctl:ruleRemoveTargetByTag=CRS;ARGS:content"
# Make the eventlist plugin work (SIGH for the lack of regexps). # Make the eventlist plugin work (SIGH for the lack of regexps).
SecRule REQUEST_FILENAME "@endsWith /wp-admin/admin-ajax.php" \ SecRule REQUEST_FILENAME "@endsWith /wp-admin/admin-ajax.php" \
...@@ -38,26 +29,26 @@ SecRule REQUEST_FILENAME "@endsWith /wp-admin/admin-ajax.php" \ ...@@ -38,26 +29,26 @@ SecRule REQUEST_FILENAME "@endsWith /wp-admin/admin-ajax.php" \
phase:2,\ phase:2,\
pass,\ pass,\
nolog,\ nolog,\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[1][title],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[1][title],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[1][cat_filter],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[1][cat_filter],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[1][num_events],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[1][num_events],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[1][location_length],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[1][location_length],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[2][title],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[2][title],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[2][cat_filter],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[2][cat_filter],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[2][num_events],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[2][num_events],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[2][location_length],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[2][location_length],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[3][title],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[3][title],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[3][cat_filter],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[3][cat_filter],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[3][num_events],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[3][num_events],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[3][location_length],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[3][location_length],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[4][title],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[4][title],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[4][cat_filter],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[4][cat_filter],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[4][num_events],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[4][num_events],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[4][location_length],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[4][location_length],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[5][title],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[5][title],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[5][cat_filter],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[5][cat_filter],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[5][num_events],\ ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[5][num_events],\
ctl:ruleRemoveTargetByTag=CRS;ARGS:widget-event_list_widget[5][location_length]" ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:widget-event_list_widget[5][location_length]"
# More eventlist plugin workarounds. # More eventlist plugin workarounds.
SecRule REQUEST_FILENAME "@endsWith /wp-admin/admin-ajax.php" \ SecRule REQUEST_FILENAME "@endsWith /wp-admin/admin-ajax.php" \
...@@ -78,3 +69,17 @@ SecRule REQUEST_URI "@beginsWith /" \ ...@@ -78,3 +69,17 @@ SecRule REQUEST_URI "@beginsWith /" \
ctl:ruleRemoveTargetByTag=attack-sqli;ARGS:message_body,\ ctl:ruleRemoveTargetByTag=attack-sqli;ARGS:message_body,\
ctl:ruleRemoveTargetByTag=attack-sqli;ARGS:text" ctl:ruleRemoveTargetByTag=attack-sqli;ARGS:text"
# Gutenberg-related requests.
SecRule REQUEST_URI "@beginsWith /wp-json/batch/v1" \
"id:1007,\
phase:2,\
pass,\
nolog,\
ctl:ruleRemoveTargetByTag=OWASP_CRS;ARGS:requests.requests.body.instance.raw.content"
SecRule REQUEST_URI "@beginsWith /wp-json/wp/v2/widget-types/text/encode" \
"id:1008,\
pass,\
nolog,\
ctl:ruleEngine=Off"
docker/conf/php/7.3/fpm/pool.d/www.conf → docker/conf/php/7.4/fpm/pool.d/www.conf
View file @ e47bff27
[www] [www]
user = ${PHP_FPM_USER} user = ${PHP_FPM_USER}
listen = /run/php/php7.3-fpm.sock listen = /run/php/php7.4-fpm.sock
pm = dynamic pm = dynamic
pm.max_children = 75 pm.max_children = 75
......