From: root Date: Fri, 18 Oct 2019 11:12:54 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=3a18c31884892546daf31c718213139577f2b9d8;p=zenbook saving uncommitted changes in /etc prior to apt run --- diff --git a/.etckeeper b/.etckeeper index bd91d19..e64c6ec 100755 --- a/.etckeeper +++ b/.etckeeper @@ -472,6 +472,7 @@ maybe chmod 0755 'apache2/mods-enabled' maybe chmod 0644 'apache2/ports.conf' maybe chmod 0755 'apache2/sites-available' maybe chmod 0644 'apache2/sites-available/000-default.conf' +maybe chmod 0644 'apache2/sites-available/20_www.conf' maybe chmod 0644 'apache2/sites-available/default-ssl.conf' maybe chmod 0755 'apache2/sites-enabled' maybe chmod 0755 'apcupsd' diff --git a/NetworkManager/system-connections/TBZ-PARIV GmbH b/NetworkManager/system-connections/TBZ-PARIV GmbH index b3437ea..6e9d2f9 100644 --- a/NetworkManager/system-connections/TBZ-PARIV GmbH +++ b/NetworkManager/system-connections/TBZ-PARIV GmbH @@ -4,7 +4,7 @@ uuid=9e5052d9-25a7-4236-a383-e48430bedb72 type=vpn autoconnect=false permissions=user:mhoellein:; -timestamp=1571061926 +timestamp=1571333177 [vpn] auth=SHA1 diff --git a/apache2/sites-available/20_www.conf b/apache2/sites-available/20_www.conf new file mode 100644 index 0000000..365fda7 --- /dev/null +++ b/apache2/sites-available/20_www.conf @@ -0,0 +1,188 @@ + + + ServerAdmin wwwadm@tbz-pariv.lan + ServerName www.tbz-pariv.lan + + SSLEngine on + SSLProtocol all -SSLv2 -SSLv3 + #SSLCipherSuite EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH + SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL + SSLCACertificatePath /etc/ssl/certs/ + SSLCertificateFile /etc/ssl/server/TBZ-PARIV_www.pem + SSLCertificateKeyFile /etc/ssl/server/TBZ-PARIV_www.pem + + ## LDAP für Telefonliste in /srv/www/vhosts/www.tbz-pariv.lan/cgi-bin/telefonliste/make/.htaccess + + # DocumentRoot: The directory out of which you will serve your + # documents. By default, all requests are taken from this directory, but + # symbolic links and aliases may be used to point to other locations. + DocumentRoot /srv/www/vhosts/www.tbz-pariv.lan + + # if not specified, the global error log is used + ErrorLog /var/log/apache2/www.tbz-pariv.lan-error_log + CustomLog /var/log/apache2/www.tbz-pariv.lan-access_log combined + CustomLog /var/log/apache2/www.tbz-pariv.lan-ssl_request_log ssl_combined + + # don't loose time with IP address lookups + HostnameLookups Off + + # needed for named virtual hosts + UseCanonicalName Off + + # configures the footer on server-generated documents + ServerSignature On + + Timeout 200 + + # Optionally, include *.conf files from /etc/apache2/conf.d/ + # + # For example, to allow execution of PHP scripts: + # + # Include /etc/apache2/conf.d/mod_php4.conf + # + # or, to include all configuration snippets added by packages: + # Include /etc/apache2/conf.d/*.conf + + + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the realname directory are treated as applications and + # run by the server when requested rather than as documents sent to the client. + # The same rules about trailing "/" apply to ScriptAlias directives as to + # Alias. + # + ScriptAlias /cgi-bin/ "/srv/www/vhosts/www.tbz-pariv.lan/cgi-bin/" + + # "/srv/www/cgi-bin" should be changed to whatever your ScriptAliased + # CGI directory exists, if you have one, and where ScriptAlias points to. + # + + AllowOverride None AuthConfig FileInfo + Options +ExecCGI -Includes + # Order allow,deny + # Allow from all + Require all granted + + + AddHandler cgi-script .cgi .pl .php + AddHandler php5-script php + + # UserDir: The name of the directory that is appended onto a user's home + # directory if a ~user request is received. + # + # To disable it, simply remove userdir from the list of modules in APACHE_MODULES + # in /etc/sysconfig/apache2. + # + + # Note that the name of the user directory ("public_html") cannot simply be + # changed here, since it is a compile time setting. The apache package + # would have to be rebuilt. You could work around by deleting + # /usr/sbin/suexec, but then all scripts from the directories would be + # executed with the UID of the webserver. + UserDir public_html + # The actual configuration of the directory is in + # /etc/apache2/mod_userdir.conf. + Include /etc/apache2/mod_userdir.conf + # You can, however, change the ~ if you find it awkward, by mapping e.g. + # http://www.example.com/users/karl-heinz/ --> /home/karl-heinz/public_html/ + #AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2 + #AliasMatch ^/~([a-zA-Z0-9-_.]*)/?(.*) /net/homeserver/home/$1/public_html/$2 + + + # + # This should be changed to whatever you set DocumentRoot to. + # + + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs-2.0/mod/core.html#options + # for more information. + # + Options FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # Options FileInfo AuthConfig Limit + # + AllowOverride AuthConfig + + # + # Controls who can get stuff from this server. + # + # Order allow,deny + # Allow from all + Require all granted + + + + Options FollowSymLinks + Options +MultiViews + + + + AllowOverride None AuthConfig FileInfo + Options +ExecCGI -Includes + # Order allow,deny + # Allow from all + Require all granted + + + # Modcron wird per WSGI angesprochen + RequestReadTimeout header=10 body=300 + WSGIDaemonProcess modcron_daemon user=modcron group=users threads=1 processes=4 maximum-requests=1000 request-timeout=600 python-home=/localhome/user/modcron + WSGIScriptAlias /modcron /localhome/user/modcron/src/modcron/modcron/apache/modcron.wsgi + + WSGIProcessGroup modcron_daemon + WSGIApplicationGroup %{GLOBAL} + # Mit einem touch auf das WSGIScript wird alles neu gestartet + ## WSGIReloadMechanism Process + # Allow from all + Require all granted + + Alias /media/modcron/ /localhome/user/modcron/src/modcron/modcron/docroot/ + + Options FollowSymLinks + # Allow from all + Require all granted + + + #Alias /alle/ /home/alle/ + # +# Options FollowSymLinks + # Allow from all + # Satisfy Any + # + + + # Modcron TEST wird per WSGI angesprochen + WSGIDaemonProcess modcrontest_daemon user=modcrontest group=modcrontest threads=1 processes=1 maximum-requests=1 + WSGIScriptAlias /modcrontest /localhome/user/modcrontest/modcron/apache/modcron.wsgi + + WSGIProcessGroup modcrontest_daemon + WSGIApplicationGroup %{GLOBAL} + # Mit einem touch auf das WSGIScript wird alles neu gestartet + ## WSGIReloadMechanism Process + # Allow from all + Require all granted +#mg20161119 Satisfy Any + + + Alias /media/modcrontest/ /localhome/user/modcron/public_html/ + + RedirectMatch permanent ^/.fjunge/dokuwiki-2009-02-14/doku.php(.*)$ http://www.tbz-pariv.lan/index.html/doku.php$1 + RedirectMatch permanent ^/(modwork_tbz.*)$ https://tbz-work/$1 + + + + ServerName www.tbz-pariv.lan + Redirect permanent / https://www.tbz-pariv.lan/ + diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 805d455..e029f69 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -79,7 +79,7 @@ Info HP Color LaserJet MFP M277dw MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended) DeviceURI socket://192.168.178.254 State Idle -StateTime 1570468102 +StateTime 1571150570 ConfigTime 1496773872 Type 8425500 Accepting Yes