aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclyhtsuriva <clyhtsuriva@gmail.com>2020-03-29 19:56:43 +0200
committerclyhtsuriva <clyhtsuriva@gmail.com>2020-03-29 19:56:43 +0200
commita6e0225c9e22d76fae9493008cad8510d94905e9 (patch)
tree000c53031f2845cb9fe300f681ec9fe3a01ef1b5
parentdc539fda0108dc724693fbdd7599bd86980f0de0 (diff)
web deleted
-rwxr-xr-xweb/.htpasswd1
-rwxr-xr-xweb/apache-modified/apache2.conf230
-rwxr-xr-xweb/howto_psql35
-rwxr-xr-xweb/website/.htaccess4
-rwxr-xr-xweb/website/fonctions.py23
-rwxr-xr-xweb/website/index.html9
-rwxr-xr-xweb/website/index.py39
-rwxr-xr-xweb/website/init-bd.sql12
-rwxr-xr-xweb/website/style.css12
-rwxr-xr-xweb/website/test.html8
-rwxr-xr-xweb/website/test.py11
11 files changed, 0 insertions, 384 deletions
diff --git a/web/.htpasswd b/web/.htpasswd
deleted file mode 100755
index 029fc64..0000000
--- a/web/.htpasswd
+++ /dev/null
@@ -1 +0,0 @@
-admin:$2y$10$7cG0rg7ZkXNbddIP4nSAAeeffvMYoXVYNix1ZayXXTfuiDOrraP8G
diff --git a/web/apache-modified/apache2.conf b/web/apache-modified/apache2.conf
deleted file mode 100755
index 96c1601..0000000
--- a/web/apache-modified/apache2.conf
+++ /dev/null
@@ -1,230 +0,0 @@
-# This is the main Apache server configuration file. It contains the
-# configuration directives that give the server its instructions.
-# See http://httpd.apache.org/docs/2.4/ for detailed information about
-# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
-# hints.
-#
-#
-# Summary of how the Apache 2 configuration works in Debian:
-# The Apache 2 web server configuration in Debian is quite different to
-# upstream's suggested way to configure the web server. This is because Debian's
-# default Apache2 installation attempts to make adding and removing modules,
-# virtual hosts, and extra configuration directives as flexible as possible, in
-# order to make automating the changes and administering the server as easy as
-# possible.
-
-# It is split into several files forming the configuration hierarchy outlined
-# below, all located in the /etc/apache2/ directory:
-#
-# /etc/apache2/
-# |-- apache2.conf
-# | `-- ports.conf
-# |-- mods-enabled
-# | |-- *.load
-# | `-- *.conf
-# |-- conf-enabled
-# | `-- *.conf
-# `-- sites-enabled
-# `-- *.conf
-#
-#
-# * apache2.conf is the main configuration file (this 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
-# supposed to determine listening ports for incoming connections which 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.
-
-
-# Global configuration
-#
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# NOTE! If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the Mutex documentation (available
-# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
-#
-#ServerRoot "/etc/apache2"
-
-#
-# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
-#
-#Mutex file:${APACHE_LOCK_DIR} default
-
-#
-# The directory where shm and other runtime files will be stored.
-#
-
-DefaultRuntimeDir ${APACHE_RUN_DIR}
-
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-# This needs to be set in /etc/apache2/envvars
-#
-PidFile ${APACHE_PID_FILE}
-
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 300
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 100
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 5
-
-
-# These need to be set in /etc/apache2/envvars
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups On
-
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here. If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog ${APACHE_LOG_DIR}/error.log
-
-#
-# LogLevel: Control the severity of messages logged to the error_log.
-# Available values: trace8, ..., trace1, debug, info, notice, warn,
-# error, crit, alert, emerg.
-# It is also possible to configure the log level for particular modules, e.g.
-# "LogLevel info ssl:warn"
-#
-LogLevel warn
-
-# Include module configuration:
-IncludeOptional mods-enabled/*.load
-IncludeOptional mods-enabled/*.conf
-
-# Include list of ports to listen on
-Include ports.conf
-
-
-# Sets the default security model of the Apache2 HTTPD server. It does
-# not allow access to the root filesystem outside of /usr/share and /var/www.
-# The former is used by web applications packaged in Debian,
-# the latter may be used for local directories served by the web server. If
-# your system is serving content from a sub-directory in /srv you must allow
-# access here, or in any related virtual host.
-<Directory />
- Options FollowSymLinks
- AllowOverride None
- Require all denied
-</Directory>
-
-<Directory /usr/share>
- AllowOverride None
- Require all granted
-</Directory>
-
-<Directory /var/www/>
- Options Indexes FollowSymLinks
- AllowOverride All
- Require all granted
-</Directory>
-
-#<Directory /srv/>
-# Options Indexes FollowSymLinks
-# AllowOverride None
-# Require all granted
-#</Directory>
-
-
-
-
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives. See also the AllowOverride
-# directive.
-#
-AccessFileName .htaccess
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-<FilesMatch "^\.ht">
- Require all denied
-</FilesMatch>
-
-
-#
-# The following directives define some format nicknames for use with
-# a CustomLog directive.
-#
-# These deviate from the Common Log Format definitions in that they use %O
-# (the actual bytes sent including headers) instead of %b (the size of the
-# requested file), because the latter makes it impossible to detect partial
-# requests.
-#
-# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
-# Use mod_remoteip instead.
-#
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-# Include of directories ignores editors' and dpkg's backup files,
-# see README.Debian for details.
-
-# Include generic snippets of statements
-IncludeOptional conf-enabled/*.conf
-
-# Include the virtual host configurations:
-IncludeOptional sites-enabled/*.conf
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-
-ErrorDocument 404 /404.html
-
diff --git a/web/howto_psql b/web/howto_psql
deleted file mode 100755
index 7d5adfc..0000000
--- a/web/howto_psql
+++ /dev/null
@@ -1,35 +0,0 @@
-#in order to make things right, you should check the following comments to visualize and use properly the PSQL database.
-
-#assuming that you installed psql prior
-#https://www.postgresql.org/download/linux/debian/
-
-#create the user
-adduser atsuser
-#use the password '123456'
-
-#connect as postgres
-su - postgres
-
-#launch the psql terminal
-psql
-
-#create the user that we use in our scripts
-CREATE USER atsuser WITH PASSWORD '123456';
-
-#create our databse
-CREATE DATABASE atsdb;
-
-#grant the privileges to our user
-GRANT ALL PRIVILEGES ON DATABASE atsdb to atsuser;
-
-#quit
-Ctrl+D
-
-#log in as atsuser
-su - atsuser
-
-#launch psql with our user and our database
-psql -d atsdb -U atsuser
-
-#initialize the tables
-\i /WHATEVER_PATH_YOUR_INIT_IS_IN/ATS-Project/website/init-bd.sql
diff --git a/web/website/.htaccess b/web/website/.htaccess
deleted file mode 100755
index 825c08d..0000000
--- a/web/website/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-AuthType Basic
-AuthName "restricted area"
-AuthUserFile /var/www/html/ATS-Project/web/.htpasswd
-require valid-user
diff --git a/web/website/fonctions.py b/web/website/fonctions.py
deleted file mode 100755
index c1566af..0000000
--- a/web/website/fonctions.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-import psycopg2
-
-def baseHTML(title,body):
- content=("""<!DOCTYPE html>
-<html>
- <head>
- <title>"""+ title +"""</title>
- <meta charset="UTF-8">
- <link rel="stylesheet" type="text/css" href="style.css">
- </head>
- <body>"""+ body +"""</body>
-</html>
-
- """)
- return content
-
-
-def connexionBD():
- connexion=psycopg2.connect ("host='localhost' dbname='atsdb' user='atsuser' password='123456'")
- return connexion
-
diff --git a/web/website/index.html b/web/website/index.html
deleted file mode 100755
index 27f4dda..0000000
--- a/web/website/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Just here to redirect you...</title>
- <meta charset="UTF-8">
- <meta http-equiv='refresh' content='0; URL=index.py'>
- </head>
- <body></body>
-</html>
diff --git a/web/website/index.py b/web/website/index.py
deleted file mode 100755
index 010ed2d..0000000
--- a/web/website/index.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-import mod_python
-from fonctions import baseHTML, connexionBD
-
-def index(req):
- req.content_type="text/html"
-
- content=str()
-
-#sql part
- conn=connexionBD()
- cur=conn.cursor()
- sql="select * from trame;"
- cur.execute(sql)
- conn.commit()
- data=cur.fetchall()
- conn.close()
-#sql part
-
- for i in data :
- content+=("""<tr>""" +
-"""<td>""" + str(i[1]) + """</td>""" +
-"""<td>""" + str(i[2]) + """</td>""" +
-"""<td>""" + str(i[3]) + """</td>""" +
-"""<td>""" + str(i[4]) + """</td>""" +
-"""</tr>""")
-
- req.write(baseHTML("ATS-Project","""
-<center><h1>ATS-Project</h1></center>
-<table>
-<tr><th>Heure</th><th>Protocole</th><th>Source</th><th>Destination</th></tr>
-"""
-+ content +
-"""
-</table>
-""")) #tableheads to change so it takes the output of the select
-
diff --git a/web/website/init-bd.sql b/web/website/init-bd.sql
deleted file mode 100755
index f1a4f2b..0000000
--- a/web/website/init-bd.sql
+++ /dev/null
@@ -1,12 +0,0 @@
---Creation of the main table
-drop table if exists trame cascade;
-
-create table trame(
- id_trame serial primary key,
- heure varchar(100),
- protocole varchar(100),
- source varchar(100),
- destination varchar(100)
-);
-
-
diff --git a/web/website/style.css b/web/website/style.css
deleted file mode 100755
index 6d0bd42..0000000
--- a/web/website/style.css
+++ /dev/null
@@ -1,12 +0,0 @@
-body {
- background-color:#000000;
-}
-
-*{
- color: white;
-}
-
-table,th,td {
- border: 2px solid red;
- text-align: center;
-}
diff --git a/web/website/test.html b/web/website/test.html
deleted file mode 100755
index b789672..0000000
--- a/web/website/test.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Test</title>
- <meta charset="UTF-8">
- </head>
- <body>This is a test page</body>
-</html>
diff --git a/web/website/test.py b/web/website/test.py
deleted file mode 100755
index 6ff289c..0000000
--- a/web/website/test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-import mod_python
-import fonctions
-
-def index(req):
- req.content_type="text/html"
- req.write(fonctions.baseHTML("Test","""
-This is a test page.</p>
-"""))