From: Frank Brehm Date: Fri, 16 Sep 2016 09:48:31 +0000 (+0200) Subject: committing changes in /etc after apt run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=044f09eca153d0ae95474ec9e290091d4e9e7c8f;p=config%2Fsarah%2Fetc.git committing changes in /etc after apt run Package changes: +dbconfig-common 1.8.47+nmu3+deb8u1 +php-gettext 1.0.11-1 +phpmyadmin 4:4.2.12-2+deb8u2 --- diff --git a/.etckeeper b/.etckeeper index bd46b6e..2c5315c 100755 --- a/.etckeeper +++ b/.etckeeper @@ -34,6 +34,7 @@ mkdir -p './network/if-pre-up.d' mkdir -p './network/interfaces.d' mkdir -p './opt' mkdir -p './perl/CPAN' +mkdir -p './phpmyadmin/conf.d' mkdir -p './postfix/sasl' mkdir -p './security/limits.d' mkdir -p './security/namespace.d' @@ -78,6 +79,8 @@ maybe chmod 0644 'amavis/en_US/template-spam-sender.txt' maybe chmod 0644 'amavis/en_US/template-virus-admin.txt' maybe chmod 0644 'amavis/en_US/template-virus-recipient.txt' maybe chmod 0644 'amavis/en_US/template-virus-sender.txt' +maybe chmod 0755 'apache2' +maybe chmod 0755 'apache2/conf-available' maybe chmod 0755 'apm' maybe chmod 0755 'apm/event.d' maybe chmod 0755 'apm/event.d/01chrony' @@ -213,6 +216,9 @@ maybe chmod 0644 'crontab' maybe chmod 0755 'cruft' maybe chmod 0755 'cruft/filters-unex' maybe chmod 0644 'cruft/filters-unex/etckeeper' +maybe chmod 0755 'dbconfig-common' +maybe chmod 0600 'dbconfig-common/config' +maybe chmod 0600 'dbconfig-common/phpmyadmin.conf' maybe chmod 0755 'dbus-1' maybe chmod 0644 'dbus-1/session.conf' maybe chmod 0755 'dbus-1/session.d' @@ -853,6 +859,19 @@ maybe chmod 0644 'php5/mods-available/mysqli.ini' maybe chmod 0644 'php5/mods-available/opcache.ini' maybe chmod 0644 'php5/mods-available/pdo.ini' maybe chmod 0644 'php5/mods-available/pdo_mysql.ini' +maybe chmod 0755 'phpmyadmin' +maybe chmod 0644 'phpmyadmin/apache.conf' +maybe chmod 0755 'phpmyadmin/conf.d' +maybe chgrp 'www-data' 'phpmyadmin/config-db.php' +maybe chmod 0640 'phpmyadmin/config-db.php' +maybe chmod 0644 'phpmyadmin/config.footer.inc.php' +maybe chmod 0644 'phpmyadmin/config.header.inc.php' +maybe chmod 0644 'phpmyadmin/config.inc.php' +maybe chgrp 'www-data' 'phpmyadmin/htpasswd.setup' +maybe chmod 0640 'phpmyadmin/htpasswd.setup' +maybe chmod 0644 'phpmyadmin/lighttpd.conf' +maybe chmod 0644 'phpmyadmin/phpmyadmin.desktop' +maybe chmod 0644 'phpmyadmin/phpmyadmin.service' maybe chmod 0755 'postfix' maybe chmod 0644 'postfix/aliases' maybe chmod 0644 'postfix/aliases.db' diff --git a/apache2/conf-available/phpmyadmin.conf b/apache2/conf-available/phpmyadmin.conf new file mode 120000 index 0000000..93808ae --- /dev/null +++ b/apache2/conf-available/phpmyadmin.conf @@ -0,0 +1 @@ +../../phpmyadmin/apache.conf \ No newline at end of file diff --git a/dbconfig-common/config b/dbconfig-common/config new file mode 100644 index 0000000..446478e --- /dev/null +++ b/dbconfig-common/config @@ -0,0 +1,11 @@ +# dbconfig-common system-wide configuration options + +# dbc_remember_admin_pass: should we cache administrative passwords? +# set to "true" to keep admin passwords cached in debconf +dbc_remember_admin_pass='false' + +# dbc_remote_questions_default: will we be likely to install on remote servers? +# set to "true" to raise the priority of debconf questions related to +# database installation on remote servers (for database types that support this) +dbc_remote_questions_default='false' + diff --git a/dbconfig-common/phpmyadmin.conf b/dbconfig-common/phpmyadmin.conf new file mode 100644 index 0000000..c0785a7 --- /dev/null +++ b/dbconfig-common/phpmyadmin.conf @@ -0,0 +1,76 @@ +# automatically generated by the maintainer scripts of phpmyadmin +# any changes you make will be preserved, though your comments +# will be lost! to change your settings you should edit this +# file and then run "dpkg-reconfigure phpmyadmin" + +# dbc_install: configure database with dbconfig-common? +# set to anything but "true" to opt out of assistance +dbc_install='true' + +# dbc_upgrade: upgrade database with dbconfig-common? +# set to anything but "true" to opt out of assistance +dbc_upgrade='true' + +# dbc_remove: deconfigure database with dbconfig-common? +# set to anything but "true" to opt out of assistance +dbc_remove='' + +# dbc_dbtype: type of underlying database to use +# this exists primarily to let dbconfig-common know what database +# type to use when a package supports multiple database types. +# don't change this value unless you know for certain that this +# package supports multiple database types +dbc_dbtype='mysql' + +# dbc_dbuser: database user +# the name of the user who we will use to connect to the database. +dbc_dbuser='phpmyadmin' + +# dbc_dbpass: database user password +# the password to use with the above username when connecting +# to a database, if one is required +dbc_dbpass='Ash6wuphec8O' + +# dbc_dbserver: database host. +# leave unset to use localhost (or a more efficient local method +# if it exists). +dbc_dbserver='' + +# dbc_dbport: remote database port +# leave unset to use the default. only applicable if you are +# using a remote database. +dbc_dbport='' + +# dbc_dbname: name of database +# this is the name of your application's database. +dbc_dbname='phpmyadmin' + +# dbc_dbadmin: name of the administrative user +# this is the administrative user that is used to create all of the above +dbc_dbadmin='root' + +# dbc_basepath: base directory to hold database files +# leave unset to use the default. only applicable if you are +# using a local (filesystem based) database. +dbc_basepath='' + +## +## postgresql specific settings. if you don't use postgresql, +## you can safely ignore all of these +## + +# dbc_ssl: should we require ssl? +# set to "true" to require that connections use ssl +dbc_ssl='' + +# dbc_authmethod_admin: authentication method for admin +# dbc_authmethod_user: authentication method for dbuser +# see the section titled "AUTHENTICATION METHODS" in +# /usr/share/doc/dbconfig-common/README.pgsql for more info +dbc_authmethod_admin='' +dbc_authmethod_user='' + +## +## end postgresql specific settings +## + diff --git a/phpmyadmin/apache.conf b/phpmyadmin/apache.conf new file mode 100644 index 0000000..3bcc4fb --- /dev/null +++ b/phpmyadmin/apache.conf @@ -0,0 +1,47 @@ +# phpMyAdmin default Apache configuration + +Alias /phpmyadmin /usr/share/phpmyadmin + + + Options FollowSymLinks + DirectoryIndex index.php + + + + AddType application/x-httpd-php .php + + + SetHandler application/x-httpd-php + + + php_flag magic_quotes_gpc Off + php_flag track_vars On + php_flag register_globals Off + php_admin_flag allow_url_fopen Off + php_value include_path . + php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp + php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext/:/usr/share/javascript/:/usr/share/php/tcpdf/ + + + + +# Authorize for setup + + + + AuthType Basic + AuthName "phpMyAdmin Setup" + AuthUserFile /etc/phpmyadmin/htpasswd.setup + + Require valid-user + + + +# Disallow web access to directories that don't need it + + Require all denied + + + Require all denied + + diff --git a/phpmyadmin/config-db.php b/phpmyadmin/config-db.php new file mode 100644 index 0000000..fc05284 --- /dev/null +++ b/phpmyadmin/config-db.php @@ -0,0 +1,19 @@ + "/usr/share/phpmyadmin", +) + +# Disallow access to libraries +$HTTP["url"] =~ "^/phpmyadmin/libraries" { + url.access-deny = ( "" ) +} +$HTTP["url"] =~ "^/phpmyadmin/setup/lib" { + url.access-deny = ( "" ) +} + +# Limit access to setup script +$HTTP["url"] =~ "^/phpmyadmin/setup" { + auth.backend = "htpasswd" + auth.backend.htpasswd.userfile = "/etc/phpmyadmin/htpasswd.setup" + auth.require = ( + "/" => ( + "method" => "basic", + "realm" => "phpMyAdmin Setup", + "require" => "valid-user" + ) + ) +} + + diff --git a/phpmyadmin/phpmyadmin.desktop b/phpmyadmin/phpmyadmin.desktop new file mode 100644 index 0000000..f9f71e3 --- /dev/null +++ b/phpmyadmin/phpmyadmin.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=phpMyAdmin +Comment=MySQL management over web +Exec=sensible-browser http://localhost/phpmyadmin/ +Terminal=false +Type=Application +Icon=phpmyadmin +Categories=Development;Database; diff --git a/phpmyadmin/phpmyadmin.service b/phpmyadmin/phpmyadmin.service new file mode 100644 index 0000000..077c926 --- /dev/null +++ b/phpmyadmin/phpmyadmin.service @@ -0,0 +1,10 @@ + + + + phpMyAdmin on %h + + _http._tcp + 80 + path=/phpmyadmin/ + +