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 + + + +
+
+ Trisquel Logo + + Trisquel Default Page for Apache2 + +
+ +
+ + +
+
+ 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 0000000..212f4d7 Binary files /dev/null and b/helpers/DATA/apache2/trisquel-logo.png differ 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