From f1f6f3f45cd113377810cac99c32d8b0728a270a Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 9 Jun 2015 16:45:47 +0100 Subject: Bug 1172953: Move contrib/docker/.* to docker/* --- contrib/docker/CLOBBER | 1 - contrib/docker/Dockerfile | 113 ------ contrib/docker/LICENSE | 362 ------------------ contrib/docker/README.md | 159 -------- contrib/docker/bugzilla.conf | 16 - contrib/docker/bugzilla_config.sh | 12 - contrib/docker/checksetup_answers.txt | 26 -- contrib/docker/fig.yml | 5 - contrib/docker/generate_bmo_data.pl | 700 ---------------------------------- contrib/docker/my.cnf | 42 -- contrib/docker/my_config.sh | 2 - contrib/docker/rpm_list | 50 --- contrib/docker/runtests.sh | 89 ----- contrib/docker/sudoers | 9 - contrib/docker/supervisord.conf | 28 -- 15 files changed, 1614 deletions(-) delete mode 100644 contrib/docker/CLOBBER delete mode 100644 contrib/docker/Dockerfile delete mode 100644 contrib/docker/LICENSE delete mode 100644 contrib/docker/README.md delete mode 100644 contrib/docker/bugzilla.conf delete mode 100644 contrib/docker/bugzilla_config.sh delete mode 100644 contrib/docker/checksetup_answers.txt delete mode 100644 contrib/docker/fig.yml delete mode 100755 contrib/docker/generate_bmo_data.pl delete mode 100644 contrib/docker/my.cnf delete mode 100644 contrib/docker/my_config.sh delete mode 100644 contrib/docker/rpm_list delete mode 100755 contrib/docker/runtests.sh delete mode 100644 contrib/docker/sudoers delete mode 100644 contrib/docker/supervisord.conf (limited to 'contrib') diff --git a/contrib/docker/CLOBBER b/contrib/docker/CLOBBER deleted file mode 100644 index 35872f131..000000000 --- a/contrib/docker/CLOBBER +++ /dev/null @@ -1 +0,0 @@ -Update this file to force the image to be rebuilt from scratch. diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile deleted file mode 100644 index 7d4aa2a92..000000000 --- a/contrib/docker/Dockerfile +++ /dev/null @@ -1,113 +0,0 @@ -FROM centos:centos7 -MAINTAINER David Lawrence - -ADD CLOBBER /CLOBBER - -# Environment configuration -ENV container docker -ENV BUGS_DB_DRIVER mysql -ENV BUGS_DB_NAME bugs -ENV BUGS_DB_PASS bugs -ENV BUGS_DB_HOST localhost - -ENV BUGZILLA_USER bugzilla -ENV BUGZILLA_HOME /home/$BUGZILLA_USER/devel/htdocs/bmo -ENV BUGZILLA_URL http://localhost/bmo - -ENV GITHUB_BASE_GIT https://github.com/mozilla/webtools-bmo-bugzilla -ENV GITHUB_BASE_BRANCH master -ENV GITHUB_QA_GIT https://github.com/mozilla/webtools-bmo-qa - -ENV ADMIN_EMAIL admin@mozilla.bugs -ENV ADMIN_PASS password -ENV TEST_SUITE sanity -ENV CPANM cpanm --quiet --notest --skip-satisfied - -# Software installation -RUN yum -y -q update && yum clean all -ADD rpm_list /rpm_list -RUN yum -y -q install https://dev.mysql.com/get/mysql-community-release-el7-5.noarch.rpm \ - && yum clean all -RUN yum -y -q install epel-release \ - && yum clean all -RUN yum -y -q install `cat /rpm_list` && yum clean all - -# User configuration -RUN useradd -m -G wheel -u 1000 -s /bin/bash $BUGZILLA_USER -RUN passwd -u -f $BUGZILLA_USER -RUN echo "bugzilla:bugzilla" | chpasswd - -# sshd -RUN mkdir -p /var/run/sshd; chmod -rx /var/run/sshd -RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' -RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' -RUN ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N '' -RUN sed -ri 's/#UseDNS yes/UseDNS no/'g /etc/ssh/sshd_config - -# Apache configuration -ADD bugzilla.conf /etc/httpd/conf.d/bugzilla.conf - -# MySQL configuration -ADD my.cnf /etc/my.cnf -RUN chmod 644 /etc/my.cnf; chown root.root /etc/my.cnf -RUN rm -rf /etc/mysql -RUN rm -rf /var/lib/mysql/* -RUN /usr/bin/mysql_install_db --user=$BUGZILLA_USER --basedir=/usr --datadir=/var/lib/mysql - -# Sudoer configuration -ADD sudoers /etc/sudoers -RUN chown root.root /etc/sudoers; chmod 440 /etc/sudoers - -# Clone the code repo -RUN su $BUGZILLA_USER -c "git clone $GITHUB_BASE_GIT -b $GITHUB_BASE_BRANCH $BUGZILLA_HOME" - -# Install Perl dependencies -# Some modules are explicitly installed due to strange dependency issues -RUN $CPANM Email::MIME::Attachment::Stripper \ - && $CPANM File::Slurp \ - && $CPANM Image::Magick@6.77 \ - && $CPANM JSON::RPC \ - && $CPANM MIME::Parser \ - && $CPANM Template::Plugin::GD::Image \ - && $CPANM Test::WWW::Selenium \ - && $CPANM TheSchwartz \ - && $CPANM XMLRPC::Lite -RUN cd $BUGZILLA_HOME \ - && ./checksetup.pl --cpanfile \ - && $CPANM --installdeps --with-recommends --with-all-features \ - --without-feature oracle --without-feature sqlite --without-feature pg . - -# Bugzilla configuration -ADD checksetup_answers.txt /checksetup_answers.txt -ADD generate_bmo_data.pl /generate_bmo_data.pl -ADD bugzilla_config.sh /bugzilla_config.sh -RUN chmod 755 /bugzilla_config.sh /generate_bmo_data.pl -RUN /bugzilla_config.sh - -# Final permissions fix -RUN chmod 711 /home/$BUGZILLA_USER -RUN chown -R $BUGZILLA_USER.$BUGZILLA_USER /home/$BUGZILLA_USER - -# Run any custom configuration -ADD my_config.sh /my_config.sh -RUN chmod 755 /my_config.sh -RUN /my_config.sh - -# Networking -RUN echo "NETWORKING=yes" > /etc/sysconfig/network -EXPOSE 80 -EXPOSE 22 - -# Testing script for CI -RUN wget https://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar \ - -O /selenium-server.jar -RUN wget https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step \ - -O /buildbot_step -RUN chmod 755 /buildbot_step -ADD runtests.sh /runtests.sh -RUN chmod 755 /runtests.sh - -# Supervisor -ADD supervisord.conf /etc/supervisord.conf -RUN chmod 700 /etc/supervisord.conf -CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"] diff --git a/contrib/docker/LICENSE b/contrib/docker/LICENSE deleted file mode 100644 index f0e5c79e1..000000000 --- a/contrib/docker/LICENSE +++ /dev/null @@ -1,362 +0,0 @@ -Mozilla Public License, version 2.0 - -1. Definitions - -1.1. "Contributor" - - means each individual or legal entity that creates, contributes to the - creation of, or owns Covered Software. - -1.2. "Contributor Version" - - means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - - means Source Code Form to which the initial Contributor has attached the - notice in Exhibit A, the Executable Form of such Source Code Form, and - Modifications of such Source Code Form, in each case including portions - thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - a. that the initial Contributor has attached the notice described in - Exhibit B to the Covered Software; or - - b. that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the terms of - a Secondary License. - -1.6. "Executable Form" - - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - - means a work that combines Covered Software with other material, in a - separate file or files, that is not Covered Software. - -1.8. "License" - - means this document. - -1.9. "Licensable" - - means having the right to grant, to the maximum extent possible, whether - at the time of the initial grant or subsequently, any and all of the - rights conveyed by this License. - -1.10. "Modifications" - - means any of the following: - - a. any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered Software; or - - b. any new file in Source Code Form that contains any Covered Software. - -1.11. "Patent Claims" of a Contributor - - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the License, - by the making, using, selling, offering for sale, having made, import, - or transfer of either its Contributions or its Contributor Version. - -1.12. "Secondary License" - - means either the GNU General Public License, Version 2.0, the GNU Lesser - General Public License, Version 2.1, the GNU Affero General Public - License, Version 3.0, or any later versions of those licenses. - -1.13. "Source Code Form" - - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that controls, is - controlled by, or is under common control with You. For purposes of this - definition, "control" means (a) the power, direct or indirect, to cause - the direction or management of such entity, whether by contract or - otherwise, or (b) ownership of more than fifty percent (50%) of the - outstanding shares or beneficial ownership of such entity. - - -2. License Grants and Conditions - -2.1. Grants - - Each Contributor hereby grants You a world-wide, royalty-free, - non-exclusive license: - - a. under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - - b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - - The licenses granted in Section 2.1 with respect to any Contribution - become effective for each Contribution on the date the Contributor first - distributes such Contribution. - -2.3. Limitations on Grant Scope - - The licenses granted in this Section 2 are the only rights granted under - this License. No additional rights or licenses will be implied from the - distribution or licensing of Covered Software under this License. - Notwithstanding Section 2.1(b) above, no patent license is granted by a - Contributor: - - a. for any code that a Contributor has removed from Covered Software; or - - b. for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - - c. under Patent Claims infringed by Covered Software in the absence of - its Contributions. - - This License does not grant any rights in the trademarks, service marks, - or logos of any Contributor (except as may be necessary to comply with - the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - - No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this - License (see Section 10.2) or under the terms of a Secondary License (if - permitted under the terms of Section 3.3). - -2.5. Representation - - Each Contributor represents that the Contributor believes its - Contributions are its original creation(s) or it has sufficient rights to - grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - - This License is not intended to limit any rights You have under - applicable copyright doctrines of fair use, fair dealing, or other - equivalents. - -2.7. Conditions - - Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in - Section 2.1. - - -3. Responsibilities - -3.1. Distribution of Source Form - - All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under - the terms of this License. You must inform recipients that the Source - Code Form of the Covered Software is governed by the terms of this - License, and how they can obtain a copy of this License. You may not - attempt to alter or restrict the recipients' rights in the Source Code - Form. - -3.2. Distribution of Executable Form - - If You distribute Covered Software in Executable Form then: - - a. such Covered Software must also be made available in Source Code Form, - as described in Section 3.1, and You must inform recipients of the - Executable Form how they can obtain a copy of such Source Code Form by - reasonable means in a timely manner, at a charge no more than the cost - of distribution to the recipient; and - - b. You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter the - recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - - You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for - the Covered Software. If the Larger Work is a combination of Covered - Software with a work governed by one or more Secondary Licenses, and the - Covered Software is not Incompatible With Secondary Licenses, this - License permits You to additionally distribute such Covered Software - under the terms of such Secondary License(s), so that the recipient of - the Larger Work may, at their option, further distribute the Covered - Software under the terms of either this License or such Secondary - License(s). - -3.4. Notices - - You may not remove or alter the substance of any license notices - (including copyright notices, patent notices, disclaimers of warranty, or - limitations of liability) contained within the Source Code Form of the - Covered Software, except that You may alter any license notices to the - extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - - You may choose to offer, and to charge a fee for, warranty, support, - indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on - behalf of any Contributor. You must make it absolutely clear that any - such warranty, support, indemnity, or liability obligation is offered by - You alone, and You hereby agree to indemnify every Contributor for any - liability incurred by such Contributor as a result of warranty, support, - indemnity or liability terms You offer. You may include additional - disclaimers of warranty and limitations of liability specific to any - jurisdiction. - -4. Inability to Comply Due to Statute or Regulation - - If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, - judicial order, or regulation then You must: (a) comply with the terms of - this License to the maximum extent possible; and (b) describe the - limitations and the code they affect. Such description must be placed in a - text file included with all distributions of the Covered Software under - this License. Except to the extent prohibited by statute or regulation, - such description must be sufficiently detailed for a recipient of ordinary - skill to be able to understand it. - -5. Termination - -5.1. The rights granted under this License will terminate automatically if You - fail to comply with any of its terms. However, if You become compliant, - then the rights granted under this License from a particular Contributor - are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing - basis, if such Contributor fails to notify You of the non-compliance by - some reasonable means prior to 60 days after You have come back into - compliance. Moreover, Your grants from a particular Contributor are - reinstated on an ongoing basis if such Contributor notifies You of the - non-compliance by some reasonable means, this is the first time You have - received notice of non-compliance with this License from such - Contributor, and You become compliant prior to 30 days after Your receipt - of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, - counter-claims, and cross-claims) alleging that a Contributor Version - directly or indirectly infringes any patent, then the rights granted to - You by any and all Contributors for the Covered Software under Section - 2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user - license agreements (excluding distributors and resellers) which have been - validly granted by You or Your distributors under this License prior to - termination shall survive termination. - -6. Disclaimer of Warranty - - Covered Software is provided under this License on an "as is" basis, - without warranty of any kind, either expressed, implied, or statutory, - including, without limitation, warranties that the Covered Software is free - of defects, merchantable, fit for a particular purpose or non-infringing. - The entire risk as to the quality and performance of the Covered Software - is with You. Should any Covered Software prove defective in any respect, - You (not any Contributor) assume the cost of any necessary servicing, - repair, or correction. This disclaimer of warranty constitutes an essential - part of this License. No use of any Covered Software is authorized under - this License except under this disclaimer. - -7. Limitation of Liability - - Under no circumstances and under no legal theory, whether tort (including - negligence), contract, or otherwise, shall any Contributor, or anyone who - distributes Covered Software as permitted above, be liable to You for any - direct, indirect, special, incidental, or consequential damages of any - character including, without limitation, damages for lost profits, loss of - goodwill, work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses, even if such party shall have been - informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from - such party's negligence to the extent applicable law prohibits such - limitation. Some jurisdictions do not allow the exclusion or limitation of - incidental or consequential damages, so this exclusion and limitation may - not apply to You. - -8. Litigation - - Any litigation relating to this License may be brought only in the courts - of a jurisdiction where the defendant maintains its principal place of - business and such litigation shall be governed by laws of that - jurisdiction, without reference to its conflict-of-law provisions. Nothing - in this Section shall prevent a party's ability to bring cross-claims or - counter-claims. - -9. Miscellaneous - - This License represents the complete agreement concerning the subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. Any law or regulation which provides that - the language of a contract shall be construed against the drafter shall not - be used to construe this License against a Contributor. - - -10. Versions of the License - -10.1. New Versions - - Mozilla Foundation is the license steward. Except as provided in Section - 10.3, no one other than the license steward has the right to modify or - publish new versions of this License. Each version will be given a - distinguishing version number. - -10.2. Effect of New Versions - - You may distribute the Covered Software under the terms of the version - of the License under which You originally received the Covered Software, - or under the terms of any subsequent version published by the license - steward. - -10.3. Modified Versions - - If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a - modified version of this License if you rename the license and remove - any references to the name of the license steward (except to note that - such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary - Licenses If You choose to distribute Source Code Form that is - Incompatible With Secondary Licenses under the terms of this version of - the License, the notice described in Exhibit B of this License must be - attached. - -Exhibit A - Source Code Form License Notice - - This Source Code Form is subject to the - terms of the Mozilla Public License, v. - 2.0. If a copy of the MPL was not - distributed with this file, You can - obtain one at - http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular file, -then You may include the notice in a location (such as a LICENSE file in a -relevant directory) where a recipient would be likely to look for such a -notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice - - This Source Code Form is "Incompatible - With Secondary Licenses", as defined by - the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/contrib/docker/README.md b/contrib/docker/README.md deleted file mode 100644 index 347d7e490..000000000 --- a/contrib/docker/README.md +++ /dev/null @@ -1,159 +0,0 @@ -Docker Bugzilla -=============== - -Configure a running Bugzilla system using Docker - -## Features - -* Running latest Centos -* Preconfigured with initial data and test product -* Running Apache2 and MySQL Community Server 5.6 -* Openssh server so you can ssh in to the system to make changes -* Code resides in `/home/bugzilla/devel/htdocs/bmo` and can be updated, - diffed, and branched using standard git commands - -## How to install Docker and Fig - -### Linux - -1. Visit [Docker][docker] and get docker up and running on your system. - -2. Visit [Fig][fig] to install Fig for managing Docker containers. - -### OSX - -1. Visit [Docker][docker] and get docker up and running on your system. - -2. Visit [Fig][fig] to install Fig for managing multiple related Docker containers. - -3. Start boot2docker in a terminal once it is installed. Ensure that you run the - export DOCKER_HOST=... lines when prompted: - -```bash -$ boot2docker start -$ export DOCKER_HOST=tcp://192.168.59.103:2375 -``` - -### Windows - -1. Install the [Windows boot2docker installer][windows] -2. Run the "Boot2Docker Start" shortcut on the startmenu (this inits the VM, - starts it and connects to it) -3. Run the following in the boot2docker VM as a one-off: - -```bash -echo 'alias fig='"'"'docker run --rm -it \ - -v $(pwd):/app \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -e FIG_PROJECT_NAME=$(basename $(pwd)) \ - dduportal/fig'"'" >> /home/docker/.ashrc -``` - -4. Logout from the VM (ctrl+D) - -Then all you need to do on later occasions is: - -1. Re-run "Boot2Docker Start" or from the console just enter: - -```bash -boot2docker start && boot2docker ssh -``` - -2. cd `/c/Users/Username/src/bmo/contrib/docker` (paths under c:\Users are - automatically mapped by boot2docker from the client into the VM) -3. `fig build` (and so on)` - -## Important boot2docker Notes - -Due to an issue with installation of certain packages in Centos7 and the -default storage driver (AUFS) used by boot2docker, we need to change the -driver to `devicemapper` for the image build process to complete properly. - -To do so, once you have boot2docker installed and the VM running, but before -performing the build process, do: - -```bash -$ boot2docker ssh -Boot2Docker version 1.4.1, build master : 86f7ec8 - Tue Dec 16 23:11:29 UTC 2014 -Docker version 1.4.1, build 5bc2ff8 -docker@boot2docker:~$ echo 'EXTRA_ARGS="--storage-driver=devicemapper"' | sudo tee -a /var/lib/boot2docker/profile -docker@boot2docker:~$ sudo /etc/init.d/docker restart -``` - -Also before building, you will need to change value in the -`checksetup_answers.txt` file to match the IP address of the boot2docker VM. -You can find the IP address by running `boot2docker ip`. - -For example, using a text editor, change the following line in -`checksetup_answers.txt` from: - -` $answer{'urlbase'} = 'http://localhost:8080/bmo/';` - -to - -` $answer{'urlbase'} = 'http://192.168.59.103:8080/bmo/';` - -## How to build Bugzilla Docker image - -To build a fresh image, just change to the directory containing the checked out -files and run the below command: - -```bash -$ fig build -``` - -## How to start Bugzilla Docker image - -To start a new container (or rerun your last container) you simply do: - -```bash -$ fig up -``` - -This will stay in the foreground and you will see the output from `supervisord`. You -can use the `-d` option to run the container in the background. - -To stop, start or remove the container that was created from the last run, you can do: - -```bash -$ fig stop -$ fig start -$ fig rm -``` - -## How to access the Bugzilla container - -If you are using Linux, you can simply point your browser to -`http://localhost:8080/bmo` to see the the Bugzilla home page. - -If using boot2docker, you will need to use the IP address of the VM. You can -find the IP address using the `boot2docker ip` command. For example: - -```bash -$ boot2docker ip -192.168.59.103 - -``` - -So would then point your browser to `http://192.168.59.103:8080/bmo`. - -The Administrator username is `admin@mozilla.bugs` and the password is `password`. -You can use the Administrator account to creat other users, add products or -components, etc. - -You can also ssh into the container using `ssh bugzilla@localhost -p2222` command. -The password is `bugzilla`. You can run multiple containers but you will need -to give each one a different name/hostname as well as non-conflicting ports -numbers for ssh and httpd. - -## TODO - -* Update `generate_bmo_data.pl` to include more sample products, groups and -settings to more closely match bugzilla.mozilla.org. -* Enable SSL support. -* Enable memcached - -[docker]: https://docs.docker.com/installation/ -[windows]: http://docs.docker.com/installation/windows/ -[fig]: http://www.fig.sh -[vagrant]: https://docs.vagrantup.com/v2/getting-started/ diff --git a/contrib/docker/bugzilla.conf b/contrib/docker/bugzilla.conf deleted file mode 100644 index 1b2b3f2e0..000000000 --- a/contrib/docker/bugzilla.conf +++ /dev/null @@ -1,16 +0,0 @@ -User bugzilla -Group bugzilla -ServerName localhost:80 -#PerlSwitches -wT -#PerlConfigRequire /home/bugzilla/devel/htdocs/bmo/mod_perl.pl - - AddHandler cgi-script .cgi - ServerName localhost - DocumentRoot "/home/bugzilla/devel/htdocs" - - DirectoryIndex index.cgi - Options Indexes FollowSymLinks ExecCGI - AllowOverride All - Require all granted - - diff --git a/contrib/docker/bugzilla_config.sh b/contrib/docker/bugzilla_config.sh deleted file mode 100644 index dc7551ab7..000000000 --- a/contrib/docker/bugzilla_config.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# Configure database -/usr/bin/mysqld_safe & -sleep 5 -mysql -u root mysql -e "GRANT ALL PRIVILEGES ON *.* TO bugs@localhost IDENTIFIED BY 'bugs'; FLUSH PRIVILEGES;" -mysql -u root mysql -e "CREATE DATABASE bugs CHARACTER SET = 'utf8';" -cd $BUGZILLA_HOME -perl checksetup.pl /checksetup_answers.txt -perl checksetup.pl /checksetup_answers.txt -perl /generate_bmo_data.pl -mysqladmin -u root shutdown diff --git a/contrib/docker/checksetup_answers.txt b/contrib/docker/checksetup_answers.txt deleted file mode 100644 index 338bd4dc0..000000000 --- a/contrib/docker/checksetup_answers.txt +++ /dev/null @@ -1,26 +0,0 @@ -$answer{'ADMIN_EMAIL'} = 'admin@mozilla.bugs'; -$answer{'ADMIN_OK'} = 'Y'; -$answer{'ADMIN_PASSWORD'} = 'password'; -$answer{'ADMIN_REALNAME'} = 'Admin'; -$answer{'NO_PAUSE'} = 1; -$answer{'create_htaccess'} = ''; -$answer{'cvsbin'} = '/usr/bin/cvs'; -$answer{'db_check'} = 1; -$answer{'db_driver'} = 'mysql'; -$answer{'db_host'} = 'localhost'; -$answer{'db_mysql_ssl_ca_file'} = ''; -$answer{'db_mysql_ssl_ca_path'} = ''; -$answer{'db_mysql_ssl_client_cert'} = ''; -$answer{'db_mysql_ssl_client_key'} = ''; -$answer{'db_name'} = 'bugs', -$answer{'db_pass'} = 'bugs'; -$answer{'db_port'} = 0; -$answer{'db_sock'} = ''; -$answer{'db_user'} = 'bugs'; -$answer{'diffpath'} = '/usr/bin'; -$answer{'index_html'} = 0; -$answer{'interdiffbin'} = '/usr/bin/interdiff'; -$answer{'memcached_servers'} = "localhost:11211"; -$answer{'urlbase'} = 'http://localhost:8080/bmo/'; -$answer{'use_suexec'} = ''; -$answer{'webservergroup'} = 'bugzilla'; diff --git a/contrib/docker/fig.yml b/contrib/docker/fig.yml deleted file mode 100644 index 25700d1ef..000000000 --- a/contrib/docker/fig.yml +++ /dev/null @@ -1,5 +0,0 @@ -bugzilla: - build: . - ports: - - "8080:80" - - "2222:22" diff --git a/contrib/docker/generate_bmo_data.pl b/contrib/docker/generate_bmo_data.pl deleted file mode 100755 index 6a5717665..000000000 --- a/contrib/docker/generate_bmo_data.pl +++ /dev/null @@ -1,700 +0,0 @@ -#!/usr/bin/perl -w -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -use strict; -use warnings; - -use lib '.'; - -use Bugzilla; -use Bugzilla::User; -use Bugzilla::Install; -use Bugzilla::Milestone; -use Bugzilla::Product; -use Bugzilla::Component; -use Bugzilla::Group; -use Bugzilla::Version; -use Bugzilla::Constants; -use Bugzilla::Keyword; -use Bugzilla::Config qw(:admin); -use Bugzilla::User::Setting; -use Bugzilla::Status; - -my $dbh = Bugzilla->dbh; - -# set Bugzilla usage mode to USAGE_MODE_CMDLINE -Bugzilla->usage_mode(USAGE_MODE_CMDLINE); - -Bugzilla->set_user(Bugzilla::User->check({ name => 'admin@mozilla.bugs' })); - -########################################################################## -# Set Default User Preferences -########################################################################## - -my %user_prefs = ( - post_bug_submit_action => 'nothing', - bugmail_new_prefix => 'on', - comment_box_position => 'after_comments', - comment_sort_order => 'oldest_to_newest', - csv_colsepchar => ',', - display_quips => 'off', - email_format => 'text_only', - headers_in_body => 'off', - inline_history => 'on', - lang => 'en', - orange_factor => 'off', - per_bug_queries => 'off', - possible_duplicates => 'on', - post_bug_submit_action => 'same_bug', - product_chooser => 'pretty_product_chooser', - quicksearch_fulltext => 'off', - quote_replies => 'quoted_reply', - requestee_cc => 'on', - request_nagging => 'on', - show_gravatars => 'On', - show_my_gravatar => 'On', - skin => 'Mozilla', - state_addselfcc => 'cc_unless_role', - timezone => 'local', - zoom_textareas => 'off', -); - -foreach my $pref (keys %user_prefs) { - my $value = $user_prefs{$pref}; - Bugzilla::User::Setting::set_default($pref, $value, 1); -} - -############################################################ -# OS, Platform, Priority -############################################################ - -my @priorities = qw( - -- - P1 - P2 - P3 - P4 - P5 -); - -if (!$dbh->selectrow_array("SELECT 1 FROM priority WHERE value = 'P1'")) { - $dbh->do("DELETE FROM priority"); - my $count = 100; - foreach my $priority (@priorities) { - $dbh->do("INSERT INTO priority (value, sortkey) VALUES (?, ?)", - undef, ($priority, $count+100)); - } -} - -my @platforms = qw( - All - ARM - x86 - x86_64 - Unspecified - Other -); - -if (!$dbh->selectrow_array("SELECT 1 FROM rep_platform WHERE value = 'ARM'")) { - $dbh->do("DELETE FROM rep_platform"); - my $count = 100; - foreach my $platform (@platforms) { - $dbh->do("INSERT INTO rep_platform (value, sortkey) VALUES (?, ?)", - undef, ($platform, $count+100)); - } -} - -my @oses= ( - 'All', - 'Windows', - 'Windows XP', - 'Windows Server 2008', - 'Windows Vista', - 'Windows 7', - 'Windows 8', - 'Windows 8.1', - 'Windows 10', - 'Windows Phone', - 'Mac OS X', - 'Linux', - 'Gonk (Firefox OS)', - 'Android', - 'iOS', - 'iOS 7', - 'iOS 8', - 'BSDI', - 'FreeBSD', - 'NetBSD', - 'OpenBSD', - 'Unspecified', - 'Other' -); - -if (!$dbh->selectrow_array("SELECT 1 FROM op_sys WHERE value = 'AIX'")) { - $dbh->do("DELETE FROM op_sys"); - my $count = 100; - foreach my $os (@oses) { - $dbh->do("INSERT INTO op_sys (value, sortkey) VALUES (?, ?)", - undef, ($os, $count+100)); - } -} - -########################################################################## -# Create Users -########################################################################## -# First of all, remove the default .* regexp for the editbugs group. -my $group = new Bugzilla::Group({ name => 'editbugs' }); -$group->set_user_regexp(''); -$group->update(); - -my @users = ( - { - login => 'nobody@mozilla.org', - realname => 'Nobody; OK to take it and work on it', - password => '*' - }, -); - -print "creating user accounts...\n"; -foreach my $user (@users) { - if (is_available_username($user->{login})) { - Bugzilla::User->create( - { login_name => $user->{login}, - realname => $user->{realname}, - cryptpassword => $user->{password}, - } - ); - if ($user->{admin}) { - Bugzilla::Install::make_admin($user->{login}); - } - } -} - -########################################################################## -# Create Classifications -########################################################################## -my @classifications = ( - { - name => "Client Software", - description => "End User Products developed by mozilla.org contributors" - }, - { - name => "Components", - description => "Standalone components that can be used by other products. " . - "Core, Directory, NSPR, NSS and Toolkit are used by Gecko " . - "(which is in turn used by Firefox, Thunderbird, SeaMonkey, " . - "Fennec, and others)", - }, - { - name => "Server Software", - description => "Web Server software developed by mozilla.org contributors " . - "to aid the development of mozilla.org products" - }, - { - name => "Other", - description => "Everything else - websites, Labs, important things which aren't code" - }, - { - name => "Graveyard", - description => "Old, retired products" - }, -); - -print "creating classifications...\n"; -for my $class (@classifications) { - my $new_class = Bugzilla::Classification->new({ name => $class->{name} }); - if (!$new_class) { - $dbh->do('INSERT INTO classifications (name, description) VALUES (?, ?)', - undef, ( $class->{name}, $class->{description} )); - } -} - -########################################################################## -# Create Some Products -########################################################################## -my @products = ( - { - classification => 'Client Software', - product_name => 'Firefox', - description => 'For bugs in Firefox Desktop, the Mozilla Foundations ' . - 'web browser. For Firefox user interface issues in ' . - 'menus, developer tools, bookmarks, location bar, and ' . - 'preferences. Many Firefox bugs will either be filed ' . - 'here or in the Core product.' . - '(more info)', - versions => [ - '34 Branch', - '35 Branch', - '36 Branch', - '37 Branch', - 'Trunk', - 'unspecified' - ], - milestones => [ - 'Firefox 36', - '---', - 'Firefox 37', - 'Firefox 38', - 'Firefox 39', - 'Future' - ], - defaultmilestone => '---', - components => [ - { - name => 'General', - description => 'For bugs in Firefox which do not fit into ' . - 'other more specific Firefox components', - initialowner => 'nobody@mozilla.org', - initialqaowner => '', - initial_cc => [], - watch_user => 'general@firefox.bugs' - } - ], - }, -); - -my $default_op_sys_id - = $dbh->selectrow_array("SELECT id FROM op_sys WHERE value = 'Unspecified'"); -my $default_platform_id - = $dbh->selectrow_array("SELECT id FROM rep_platform WHERE value = 'Unspecified'"); - -print "creating products...\n"; -for my $product (@products) { - my $new_product = - Bugzilla::Product->new({ name => $product->{product_name} }); - if (!$new_product) { - my $class_id = 1; - if ($product->{classification}) { - $class_id = Bugzilla::Classification->new({ name => $product->{classification} })->id; - } - $dbh->do('INSERT INTO products (name, description, classification_id, - default_op_sys_id, default_platform_id) - VALUES (?, ?, ?, ?, ?)', - undef, ( $product->{product_name}, $product->{description}, - $class_id, $default_op_sys_id, $default_platform_id )); - - $new_product - = new Bugzilla::Product( { name => $product->{product_name} } ); - - $dbh->do( 'INSERT INTO milestones (product_id, value) VALUES (?, ?)', - undef, ( $new_product->id, $product->{defaultmilestone} ) ); - - # Now clear the internal list of accessible products. - delete Bugzilla->user->{selectable_products}; - - foreach my $component (@{ $product->{components} }) { - if (!Bugzilla::User->new({ name => $component->{watch_user} })) { - Bugzilla::User->create({ - login_name => $component->{watch_user}, - cryptpassword => '*', - }); - } - Bugzilla->input_params({ watch_user => $component->{watch_user} }); - Bugzilla::Component->create({ - name => $component->{name}, - product => $new_product, - description => $component->{description}, - initialowner => $component->{initialowner}, - initialqacontact => $component->{initialqacontact} || '', - initial_cc => $component->{initial_cc} || [], - }); - } - } - - foreach my $version (@{ $product->{versions} }) { - if (!new Bugzilla::Version({ name => $version, - product => $new_product })) - { - Bugzilla::Version->create({value => $version, product => $new_product}); - } - } - - foreach my $milestone (@{ $product->{milestones} }) { - if (!new Bugzilla::Milestone({ name => $milestone, - product => $new_product })) - { - $dbh->do('INSERT INTO milestones (product_id, value) VALUES (?,?)', - undef, $new_product->id, $milestone); - } - } -} - -########################################################################## -# Create Groups -########################################################################## -my @groups = ( - { - name => 'core-security', - description => 'Security-Sensitive Core Bug', - no_admin => 1, - bug_group => 1, - all_products => 1, - }, - { - name => 'can_edit_comments', - description => 'Members of this group will be able to edit comments', - no_admin => 0, - bug_group => 0, - all_products => 0, - }, - { - name => 'can_restrict_comments', - description => 'Members of this group will be able to restrict comments on bugs', - no_admin => 0, - all_products => 0, - bug_group => 0, - }, - { - name => 'timetrackers', - description => 'Time Trackers', - no_admin => 1, - all_products => 0, - bug_group => 0, - }, -); - -print "creating groups...\n"; -foreach my $group (@groups) { - my $name = $group->{name}; - my $desc = $group->{desc}; - my $bug_group = exists $group->{bug_group} ? $group->{bug_group} : 1; - my $no_admin = exists $group->{no_admin} ? $group->{no_admin} : 0; - - if (!Bugzilla::Group->new({ name => $name })) { - my $new_group; - if (exists $group->{no_admin} && $group->{no_admin}) { - $dbh->do('INSERT INTO groups (name, description, isbuggroup, isactive) - VALUES (?, ?, 1, 1)', - undef, ($group->{name}, $group->{description})); - $new_group = Bugzilla::Group->new({ name => $group->{name} }); - } - else { - $new_group - = Bugzilla::Group->create({ name => $group->{name}, - description => $group->{description}, - isbuggroup => $group->{bug_group} }); - } - - if (exists $group->{all_products} && $group->{all_products}) { - $dbh->do('INSERT INTO group_control_map - (group_id, product_id, entry, membercontrol, othercontrol, canedit) - SELECT ?, products.id, 0, ?, ?, 0 FROM products', - undef, ( $new_group->id, CONTROLMAPSHOWN, CONTROLMAPSHOWN ) ); - } - } -} - -########################################################################## -# Set Parameters -########################################################################## - -my %set_params = ( - allowbugdeletion => 1, - allowuserdeletion => 0, - allow_attachment_deletion => 1, - bonsai_url => 'http://bonsai.mozilla.org', - collapsed_comment_tags => 'obsolete,spam,typo,me-too,advocacy,off-topic,offtopic,abuse,abusive', - confirmuniqueusermatch => 0, - maxusermatches => '100', - debug_group => 'editbugs', - defaultpriority => '--', # FIXME: add priority - defaultquery => 'resolution=---&emailassigned_to1=1&emailassigned_to2=1' . - '&emailreporter2=1&emailqa_contact2=1&emailtype1=exact' . - '&emailtype2=exact&order=Importance&keywords_type=allwords' . - '&long_desc_type=substring', - defaultseverity => 'normal', - edit_comments_group => 'can_edit_comments', - insidergroup => 'core-security', - last_visit_keep_days => '28', - lxr_url => 'http://mxr.mozilla.org/mozilla', - lxr_root => 'mozilla/', - mail_delivery_method => 'Test', - mailfrom => '"Bugzilla@Mozilla" ', - maintainer => 'bugzilla-admin@mozilla.org', - maxattachmentsize => '10240', - maxusermatches => '100', - mostfreqthreshold => '5', - mybugstemplate => 'buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW' . - '&bug_status=ASSIGNED&bug_status=REOPENED' . - '&emailassigned_to1=1&emailreporter1=1' . - '&emailtype1=exact&email1=%userid%' . - '&field0-0-0=bug_status&type0-0-0=notequals' . - '&value0-0-0=UNCONFIRMED&field0-0-1=reporter' . - '&type0-0-1=equals&value0-0-1=%userid%', - persona_verify_url => 'https://verifier.login.persona.org/verify', - persona_includejs_url => 'https://login.persona.org/include.js', - quip_list_entry_control => 'moderated', - restrict_comments_group => 'editbugs', - restrict_comments_enable_group => 'can_restrict_comments', - search_allow_no_criteria => 0, - strict_transport_security => 'include_subdomains', - timetrackinggroup => 'timetrackers', - upgrade_notification => 'disabled', - useclassification => 1, - usetargetmilestone => 1, - usestatuswhiteboard => 1, - usebugaliases => 1, - useqacontact => 1, - use_mailer_queue => 1, - user_info_class => 'Persona,CGI', -); - -my $params_modified; -foreach my $param (keys %set_params) { - my $value = $set_params{$param}; - next unless defined $value && Bugzilla->params->{$param} ne $value; - SetParam($param, $value); - $params_modified = 1; -} - -write_params() if $params_modified; - -########################################################################## -# Create flag types -########################################################################## -my @flagtypes = ( - { - name => 'review', - desc => 'The patch has passed review by a module owner or peer.', - is_requestable => 1, - is_requesteeble => 1, - is_multiplicable => 1, - grant_group => '', - target_type => 'a', - cc_list => '', - inclusions => [''] - }, - { - name => 'feedback', - desc => 'A particular person\'s input is requested for a patch, ' . - 'but that input does not amount to an official review.', - is_requestable => 1, - is_requesteeble => 1, - is_multiplicable => 1, - grant_group => '', - target_type => 'a', - cc_list => '', - inclusions => [''] - } -); - -print "creating flag types...\n"; -foreach my $flag (@flagtypes) { - next if new Bugzilla::FlagType({ name => $flag->{name} }); - my $grant_group_id = $flag->{grant_group} - ? Bugzilla::Group->new({ name => $flag->{grant_group} })->id - : undef; - my $request_group_id = $flag->{request_group} - ? Bugzilla::Group->new({ name => $flag->{request_group} })->id - : undef; - - $dbh->do('INSERT INTO flagtypes (name, description, cc_list, target_type, is_requestable, - is_requesteeble, is_multiplicable, grant_group_id, request_group_id) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', - undef, ($flag->{name}, $flag->{desc}, $flag->{cc_list}, $flag->{target_type}, - $flag->{is_requestable}, $flag->{is_requesteeble}, $flag->{is_multiplicable}, - $grant_group_id, $request_group_id)); - - my $type_id = $dbh->bz_last_key('flagtypes', 'id'); - - foreach my $inclusion (@{$flag->{inclusions}}) { - my ($product, $component) = split(':', $inclusion); - my ($prod_id, $comp_id); - if ($product) { - my $prod_obj = Bugzilla::Product->new({ name => $product }); - $prod_id = $prod_obj->id; - if ($component) { - $comp_id = Bugzilla::Component->new({ name => $component, product => $prod_obj})->id; - } - } - $dbh->do('INSERT INTO flaginclusions (type_id, product_id, component_id) - VALUES (?, ?, ?)', - undef, ($type_id, $prod_id, $comp_id)); - } -} - -########################################################### -# Create bug status -########################################################### - -my @statuses = ( - { - value => undef, - transitions => [['UNCONFIRMED', 0], ['NEW', 0], ['ASSIGNED', 0]], - }, - { - value => 'UNCONFIRMED', - sortkey => 100, - isactive => 1, - isopen => 1, - transitions => [['NEW', 0], ['ASSIGNED', 0], ['RESOLVED', 0]], - }, - { - value => 'NEW', - sortkey => 200, - isactive => 1, - isopen => 1, - transitions => [['UNCONFIRMED', 0], ['ASSIGNED', 0], ['RESOLVED', 0]], - }, - { - value => 'ASSIGNED', - sortkey => 300, - isactive => 1, - isopen => 1, - transitions => [['UNCONFIRMED', 0], ['NEW', 0], ['RESOLVED', 0]], - }, - { - value => 'REOPENED', - sortkey => 400, - isactive => 1, - isopen => 1, - transitions => [['UNCONFIRMED', 0], ['NEW', 0], ['ASSIGNED', 0], ['RESOLVED', 0]], - }, - { - value => 'RESOLVED', - sortkey => 500, - isactive => 1, - isopen => 0, - transitions => [['UNCONFIRMED', 0], ['REOPENED', 0], ['VERIFIED', 0]], - }, - { - value => 'VERIFIED', - sortkey => 600, - isactive => 1, - isopen => 0, - transitions => [['UNCONFIRMED', 0], ['REOPENED', 0], ['RESOLVED', 0]], - }, - { - value => 'CLOSED', - sortkey => 700, - isactive => 1, - isopen => 0, - transitions => [['UNCONFIRMED', 0], ['REOPENED', 0], ['RESOLVED', 0]], - }, -); - -if (!$dbh->selectrow_array("SELECT 1 FROM bug_status WHERE value = 'ASSIGNED'")) { - $dbh->do('DELETE FROM bug_status'); - $dbh->do('DELETE FROM status_workflow'); - - print "creating status workflow...\n"; - - # One pass to add the status entries. - foreach my $status (@statuses) { - next if !$status->{value}; - $dbh->do('INSERT INTO bug_status (value, sortkey, isactive, is_open) VALUES (?, ?, ?, ?)', - undef, ( $status->{value}, $status->{sortkey}, $status->{isactive}, $status->{isopen} )); - } - - # Another pass to add the transitions. - foreach my $status (@statuses) { - my $old_id; - if ($status->{value}) { - my $from_status = new Bugzilla::Status({ name => $status->{value} }); - $old_id = $from_status->{id}; - } else { - $old_id = undef; - } - - foreach my $transition (@{$status->{transitions}}) { - my $to_status = new Bugzilla::Status({ name => $transition->[0] }); - - $dbh->do('INSERT INTO status_workflow (old_status, new_status, require_comment) VALUES (?, ?, ?)', - undef, ( $old_id, $to_status->{id}, $transition->[1] )); - } - } -} - -########################################################### -# Creating resolutions -########################################################### - -my @resolutions = ( - { - value => '', - sortkey => 100, - isactive => 1, - }, - { - value => 'FIXED', - sortkey => 200, - isactive => 1, - }, - { - value => 'INVALID', - sortkey => 300, - isactive => 1, - }, - { - value => 'WONTFIX', - sortkey => 400, - isactive => 1, - }, - { - value => 'DUPLICATE', - sortkey => 700, - isactive => 1, - }, - { - value => 'WORKSFORME', - sortkey => 800, - isactive => 1, - }, - { - value => 'EXPIRED', - sortkey => 900, - isactive => 1, - }, - { - value => 'MOVED', - sortkey => 1000, - isactive => 0, - }, - { - value => 'INCOMPLETE', - sortkey => 850, - isactive => 1, - }, - { - value => 'SUPPORT', - sortkey => 875, - isactive => 0, - }, -); - -if (!$dbh->selectrow_array("SELECT 1 FROM resolution WHERE value = 'INCOMPLETE'")) { - $dbh->do('DELETE FROM resolution'); - print "creating resolutions...\n"; - foreach my $resolution (@resolutions) { - next if !$resolution->{value}; - $dbh->do('INSERT INTO resolution (value, sortkey, isactive) VALUES (?, ?, ?)', - undef, ($resolution->{value}, $resolution->{sortkey}, $resolution->{isactive})); - } -} - -########################################################### -# Create Keywords -########################################################### - -my @keywords = ( - { - name => 'regression', - description => 'The problem was fixed, but then it came back (regressed) ' . - 'and this new bug was filed to track the regression.' - }, - { - name => 'relnote', - description => 'This bug need to be put on release notes for next ' . - 'milestone announcement.' - }, -); - -print "creating keywords...\n"; -foreach my $kw (@keywords) { - next if new Bugzilla::Keyword({ name => $kw->{name} }); - Bugzilla::Keyword->create($kw); -} - -print "installation and configuration complete!\n"; diff --git a/contrib/docker/my.cnf b/contrib/docker/my.cnf deleted file mode 100644 index b7e035ce5..000000000 --- a/contrib/docker/my.cnf +++ /dev/null @@ -1,42 +0,0 @@ -[mysql] -max_allowed_packet=1G - -[mysqld] -user = bugzilla -default_storage_engine = InnoDB -socket = /var/lib/mysql/mysql.sock -pid_file = /var/lib/mysql/mysql.pid -key_buffer_size = 32M -myisam_recover = FORCE,BACKUP -max_allowed_packet = 1G -max_connect_errors = 1000000 -innodb = FORCE -datadir = /var/lib/mysql -character-set-server = utf8mb4 -collation-server = utf8mb4_general_ci - -tmp_table_size = 32M -max_heap_table_size = 32M -query_cache_type = 0 -query_cache_size = 0 -max_connections = 500 -thread_cache_size = 50 -#open_files_limit = 65535 -table_definition_cache = 1024 -table_open_cache = 2048 - -innodb_flush_method = O_DIRECT -innodb_log_files_in_group = 2 -innodb_log_file_size = 256M -innodb_flush_log_at_trx_commit = 2 -innodb_file_per_table = 1 -innodb_buffer_pool_size = 1G -innodb_flush_neighbors = 0 -innodb_flush_log_at_trx_commit = 2 - -log_error = /var/lib/mysql/mysql-error.log -log_queries_not_using_indexes = 0 -slow_query_log = 0 -slow_query_log_file = /var/lib/mysql/mysql-slow.log -general_log = 0 -general_log_file = /var/lib/mysql/bmo_query.log diff --git a/contrib/docker/my_config.sh b/contrib/docker/my_config.sh deleted file mode 100644 index e35e8dd90..000000000 --- a/contrib/docker/my_config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -# Add any custom setup instructions here diff --git a/contrib/docker/rpm_list b/contrib/docker/rpm_list deleted file mode 100644 index d3b024344..000000000 --- a/contrib/docker/rpm_list +++ /dev/null @@ -1,50 +0,0 @@ -ImageMagick-devel -asciidoc -aspell-devel -bzip2 -dblatex -docbook-style-dsssl -firefox -gcc -gcc-c++ -gd-devel -git -gmp-devel -graphviz -jade -java-1.7.0-openjdk -lynx -make -memcached -mod_perl -mod_perl-devel -mpfr-devel -mysql-community-devel -mysql-community-server -openssh -openssh-server -openssl-devel -passwd -patch -perl-core -perl-App-cpanminus -perl-CPAN -postfix -python-sphinx -sudo -supervisor -tar -texlive-cmap -texlive-cyrillic -texlive-framed -texlive-mdwtools -texlive-parskip -texlive-tex4ht -texlive-threeparttable -texlive-ucs -texlive-wrapfig -unzip -vim-enhanced -wget -xmlto -xorg-x11-server-Xvfb diff --git a/contrib/docker/runtests.sh b/contrib/docker/runtests.sh deleted file mode 100755 index 34e889174..000000000 --- a/contrib/docker/runtests.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -set -e - -# Output to log file as well as STDOUT/STDERR -exec > >(tee /runtests.log) 2>&1 - -echo "== Retrieving Bugzilla code" -echo "Checking out $GITHUB_BASE_GIT $GITHUB_BASE_BRANCH ..." -mv $BUGZILLA_HOME "${BUGZILLA_HOME}.back" -git clone $GITHUB_BASE_GIT --single-branch --depth 1 --branch $GITHUB_BASE_BRANCH $BUGZILLA_HOME -cd $BUGZILLA_HOME -if [ "$GITHUB_BASE_REV" != "" ]; then - echo "Switching to revision $GITHUB_BASE_REV ..." - git checkout -q $GITHUB_BASE_REV -fi - -if [ "$TEST_SUITE" = "sanity" ]; then - cd $BUGZILLA_HOME - /buildbot_step "Sanity" prove -f -v t/*.t - exit $? -fi - -if [ "$TEST_SUITE" = "docs" ]; then - export JADE_PUB=/usr/share/sgml - export LDP_HOME=/usr/share/sgml/docbook/dsssl-stylesheets-1.79/dtds/decls - cd $BUGZILLA_HOME/docs - /buildbot_step "Documentation" perl makedocs.pl --with-pdf - exit $? -fi - -echo -e "\n== Cloning QA test suite" -cd $BUGZILLA_HOME -echo "Cloning git repo $GITHUB_QA_GIT branch $GITHUB_BASE_BRANCH ..." -git clone $GITHUB_QA_GIT -b $GITHUB_BASE_BRANCH qa - -echo -e "\n== Starting database" -/usr/bin/mysqld_safe & -sleep 3 - -echo -e "\n== Starting memcached" -/usr/bin/memcached -u memcached -d -sleep 3 - -echo -e "\n== Updating configuration" -sed -e "s?%DB%?$BUGS_DB_DRIVER?g" --in-place qa/config/checksetup_answers.txt -sed -e "s?%DB_NAME%?bugs_test?g" --in-place qa/config/checksetup_answers.txt -sed -e "s?%USER%?$BUGZILLA_USER?g" --in-place qa/config/checksetup_answers.txt -sed -e "s?%TRAVIS_BUILD_DIR%?$BUGZILLA_HOME?g" --in-place qa/config/selenium_test.conf -echo "\$answer{'memcached_servers'} = 'localhost:11211';" >> qa/config/checksetup_answers.txt - -echo -e "\n== Running checksetup" -cd $BUGZILLA_HOME -./checksetup.pl qa/config/checksetup_answers.txt -./checksetup.pl qa/config/checksetup_answers.txt - -echo -e "\n== Generating test data" -cd $BUGZILLA_HOME/qa/config -perl generate_test_data.pl - -echo -e "\n== Starting web server" -sed -e "s?^#Perl?Perl?" --in-place /etc/httpd/conf.d/bugzilla.conf -/usr/sbin/httpd & -sleep 3 - -if [ "$TEST_SUITE" = "selenium" ]; then - export DISPLAY=:0 - - echo -e "\n== Starting virtual frame buffer" - Xvfb $DISPLAY -screen 0 1024x768x24 > /dev/null 2>&1 & - sleep 5 - - echo -e "\n== Starting Selenium server" - java -jar /selenium-server.jar -log /selenium.log > /dev/null 2>&1 & - sleep 5 - - cd $BUGZILLA_HOME/qa/t - /buildbot_step "Selenium" prove -f -v -I$BUGZILLA_HOME/lib test_*.t - exit $? -fi - -if [ "$TEST_SUITE" = "webservices" ]; then - cd $BUGZILLA_HOME/qa/t - /buildbot_step "Webservices" prove -f -v -I$BUGZILLA_HOME/lib webservice_*.t - exit $? -fi diff --git a/contrib/docker/sudoers b/contrib/docker/sudoers deleted file mode 100644 index 04d382959..000000000 --- a/contrib/docker/sudoers +++ /dev/null @@ -1,9 +0,0 @@ -Defaults env_reset -Defaults env_keep = "COLORS DISPLAY HOSTNAME HISTSIZE INPUTRC KDEDIR LS_COLORS" -Defaults env_keep += "MAIL PS1 PS2 QTDIR USERNAME LANG LC_ADDRESS LC_CTYPE" -Defaults env_keep += "LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES" -Defaults env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE" -Defaults env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY" -Defaults secure_path = /sbin:/bin:/usr/sbin:/usr/bin -root ALL=(ALL) ALL -%wheel ALL=(ALL) NOPASSWD: ALL diff --git a/contrib/docker/supervisord.conf b/contrib/docker/supervisord.conf deleted file mode 100644 index b3007daf3..000000000 --- a/contrib/docker/supervisord.conf +++ /dev/null @@ -1,28 +0,0 @@ -[supervisord] -nodaemon=true -logfile=/var/log/supervisor/supervisord.log -logfile_maxbytes=50MB -logfile_backups=10 -loglevel=debug -pidfile=/var/run/supervisord.pid -minfds=1024 -minprocs=200 - -[program:sshd] -command=/usr/sbin/sshd -D - -[program:httpd] -command=/usr/sbin/httpd -DFOREGROUND - -[program:mysqld] -command=/usr/bin/mysqld_safe - -[program:postfix] -command = /usr/sbin/postfix start -startsecs = 0 -autorestart = false - -[program:memcached] -command=/usr/bin/memcached -u memcached -stderr_logfile=/var/log/supervisor/memcached.log -stdout_logfile=/var/log/supervisor/memcached.log -- cgit v1.2.3-24-g4f1b