From 402421919932f245b799f079c8c8b725e9c3f09b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= Date: Tue, 2 Sep 2014 04:51:37 +0200 Subject: [PATCH] Rebranded apache2 start page --- helpers/DATA/apache2/index.html | 353 +++++++++++++++++++++++++ helpers/DATA/apache2/trisquel-logo.png | Bin 0 -> 14109 bytes helpers/make-apache2 | 7 +- 3 files changed, 359 insertions(+), 1 deletion(-) create mode 100644 helpers/DATA/apache2/index.html create mode 100644 helpers/DATA/apache2/trisquel-logo.png diff --git a/helpers/DATA/apache2/index.html b/helpers/DATA/apache2/index.html new file mode 100644 index 0000000..1490e03 --- /dev/null +++ b/helpers/DATA/apache2/index.html @@ -0,0 +1,353 @@ + + + + + Trisquel GNU/Linux Default Page for Apache2: It works + + + +
+ + +
+ + +
+
+ It works! +
+
+

+ This is the default welcome page used to test the correct + operation of the Apache2 server after installation on Trisquel systems. + It is based on the equivalent page on Debian, from which the Trisquel Apache + packaging is derived. + If you can read this page, it means that the Apache HTTP server installed at + this site is working properly. You should replace this file (located at + /var/www/html/index.html) before continuing to operate your HTTP server. +

+ + +

+ If you are a normal user of this web site and don't know what this page is + about, this probably means that the site is currently unavailable due to + maintenance. + If the problem persists, please contact the site's administrator. +

+ +
+
+
+ Configuration Overview +
+
+

+ Trisquel's Apache2 default configuration is different from the + upstream default configuration, and split into several files optimized for + interaction with Trisquel tools. The configuration system is + fully documented in + /usr/share/doc/apache2/README.Debian.gz. Refer to this for the full + documentation. Documentation for the web server itself can be + found by accessing the manual if the apache2-doc + package was installed on this server. + +

+

+ The configuration layout for an Apache2 web server installation on Trisquel systems is as follows: +

+
+/etc/apache2/
+|-- apache2.conf
+|       `--  ports.conf
+|-- mods-enabled
+|       |-- *.load
+|       `-- *.conf
+|-- conf-enabled
+|       `-- *.conf
+|-- sites-enabled
+|       `-- *.conf
+          
+
    +
  • + apache2.conf is the main configuration + file. It puts the pieces together by including all remaining configuration + files when starting up the web server. +
  • + +
  • + ports.conf is always included from the + main configuration file. It is used to determine the listening ports for + incoming connections, and this file can be customized anytime. +
  • + +
  • + Configuration files in the mods-enabled/, + conf-enabled/ and sites-enabled/ directories contain + particular configuration snippets which manage modules, global configuration + fragments, or virtual host configurations, respectively. +
  • + +
  • + They are activated by symlinking available + configuration files from their respective + *-available/ counterparts. These should be managed + by using our helpers + + a2enmod, + a2dismod, + + + a2ensite, + a2dissite, + + and + + a2enconf, + a2disconf + . See their respective man pages for detailed information. +
  • + +
  • + The binary is called apache2. Due to the use of + environment variables, in the default configuration, apache2 needs to be + started/stopped with /etc/init.d/apache2 or apache2ctl. + Calling /usr/bin/apache2 directly will not work with the + default configuration. +
  • +
+
+ +
+
+ Document Roots +
+ +
+

+ By default, Trisquel does not allow access through the web browser to + any file apart of those located in /var/www, + public_html + directories (when enabled) and /usr/share (for web + applications). If your site is using a web document root + located elsewhere (such as in /srv) you may need to whitelist your + document root directory in /etc/apache2/apache2.conf. +

+

+ The default Trisquel document root is /var/www/html. You + can make your own virtual hosts under /var/www. This is different + to previous releases which provides better security out of the box. +

+
+ + + + +
+
+ + + diff --git a/helpers/DATA/apache2/trisquel-logo.png b/helpers/DATA/apache2/trisquel-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..212f4d71b75450ba983eb94714cb2d56d4a3e759 GIT binary patch literal 14109 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 QpRxf;^6GLmvf!})0ML-FOaK4? literal 0 HcmV?d00001 diff --git a/helpers/make-apache2 b/helpers/make-apache2 index 785f944..ecd8801 100644 --- a/helpers/make-apache2 +++ b/helpers/make-apache2 @@ -17,10 +17,15 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 . ./config +rm debian/icons/ubuntu-logo.png +cp $DATA/trisquel-logo.png debian/icons/ +cp $DATA/index.html debian/ +replace ubuntu-logo trisquel-logo . + # Make the banner be Trisquel GNU/Linux instead of just Trisquel sed '/^LSB_RELEASE/s/$/_GNU\/Linux/' -i debian/rules