From 06b1656bf64c21540c5a947cb8d3bbef1c8441d2 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Fri, 13 Oct 2017 23:34:04 +0200
Subject: [PATCH] =?UTF-8?q?anpassungen=20vorstandspi=20f=C3=BCr=20aktuelle?=
=?UTF-8?q?=20debian=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
all/common/handlers/main.yml | 7 ++
host_vars/vorstandspi | 6 +-
vorstandspi/git/handlers/main.yml | 4 +-
vorstandspi/git/tasks/main.yml | 8 +-
vorstandspi/mysql/files/datadir.cnf | 3 +
vorstandspi/mysql/files/my.cnf | 125 ----------------------------
vorstandspi/mysql/handlers/main.yml | 4 +-
vorstandspi/mysql/tasks/main.yml | 43 ++++++++--
8 files changed, 56 insertions(+), 144 deletions(-)
create mode 100644 vorstandspi/mysql/files/datadir.cnf
delete mode 100644 vorstandspi/mysql/files/my.cnf
diff --git a/all/common/handlers/main.yml b/all/common/handlers/main.yml
index 0c4def42..56fd8084 100644
--- a/all/common/handlers/main.yml
+++ b/all/common/handlers/main.yml
@@ -1,3 +1,10 @@
---
+# Debian stretch
+- name: restart ssh
+ service: name=ssh state=restarted
+ ignore_errors: yes
+
+# Debian jessie
- name: restart sshd
service: name=sshd state=restarted
+ ignore_errors: yes
diff --git a/host_vars/vorstandspi b/host_vars/vorstandspi
index 46f6712c..ccc3116f 100644
--- a/host_vars/vorstandspi
+++ b/host_vars/vorstandspi
@@ -3,10 +3,12 @@
motd_lines:
- "Vorstands-PI"
- - "Öffentliche IPs: {{ansible_eth0.ipv4.address}} / {{ansible_eth0.ipv6[0].address}}"
+ - "Öffentliche IPs: {{ansible_enxb827eb5e23fd.ipv4.address}} / {{ansible_enxb827eb5e23fd.ipv6[0].address}}"
debian_sources:
- - "deb http://mirrordirector.raspbian.org/raspbian/ jessie main contrib non-free rpi"
+ - "deb http://mirrordirector.raspbian.org/raspbian/ stretch main contrib non-free rpi"
+
+debian_keys:
administratorenteam:
- "ole"
diff --git a/vorstandspi/git/handlers/main.yml b/vorstandspi/git/handlers/main.yml
index 6abd1f26..a089fbc7 100644
--- a/vorstandspi/git/handlers/main.yml
+++ b/vorstandspi/git/handlers/main.yml
@@ -3,9 +3,9 @@
- name: init git folder verwaltung
command: git init
args:
- chdir: /mnt/data/verwaltung/
+ chdir: /srv/data/verwaltung/
- name: init git folder dokumentenarchiv
command: git init
args:
- chdir: /mnt/data/dokumentenarchiv/
+ chdir: /srv/data/dokumentenarchiv/
diff --git a/vorstandspi/git/tasks/main.yml b/vorstandspi/git/tasks/main.yml
index 697db843..9d82c8fe 100644
--- a/vorstandspi/git/tasks/main.yml
+++ b/vorstandspi/git/tasks/main.yml
@@ -1,7 +1,7 @@
---
# Pakete installieren
-- name: gitolite installieren
+- name: git installieren
apt:
pkg: "{{ item }}"
update_cache: yes
@@ -11,13 +11,13 @@
# Git Repo für Verwaltungsdaaten
-# Git-URL: ssh://root@vorstand.warpzone.ms:444/mnt/data/verwaltung/
+# Git-URL: ssh://root@vorstand.warpzone.ms:444/srvmnt/data/verwaltung/
- name: create folder struct for git verwaltung
- file: path=/mnt/data/verwaltung/ state=directory
+ file: path=/srv/data/verwaltung/ state=directory
notify: init git folder verwaltung
# Git Repo für Dokumentenarchiv
# Git-URL: ssh://root@vorstand.warpzone.ms:444/mnt/data/dokumentenarchiv/
- name: create folder struct for git dokumentenarchiv
- file: path=/mnt/data/dokumentenarchiv/ state=directory
+ file: path=/srv/data/dokumentenarchiv/ state=directory
notify: init git folder dokumentenarchiv
diff --git a/vorstandspi/mysql/files/datadir.cnf b/vorstandspi/mysql/files/datadir.cnf
new file mode 100644
index 00000000..03dc7bf7
--- /dev/null
+++ b/vorstandspi/mysql/files/datadir.cnf
@@ -0,0 +1,3 @@
+
+[mysqld]
+datadir = /srv/data/mysql
diff --git a/vorstandspi/mysql/files/my.cnf b/vorstandspi/mysql/files/my.cnf
deleted file mode 100644
index f4dfb38a..00000000
--- a/vorstandspi/mysql/files/my.cnf
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
-
-[mysqld]
-#
-# * Basic Settings
-#
-user = mysql
-pid-file = /var/run/mysqld/mysqld.pid
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /mnt/data/mysql
-tmpdir = /tmp
-lc-messages-dir = /usr/share/mysql
-skip-external-locking
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-bind-address = 127.0.0.1
-#
-# * Fine Tuning
-#
-key_buffer = 16M
-max_allowed_packet = 16M
-thread_stack = 192K
-thread_cache_size = 8
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover = BACKUP
-#max_connections = 100
-#table_cache = 64
-#thread_concurrency = 10
-#
-# * Query Cache Configuration
-#
-query_cache_limit = 1M
-query_cache_size = 16M
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file = /var/log/mysql/mysql.log
-#general_log = 1
-#
-# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
-#
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-# other settings you may need to change.
-#server-id = 1
-#log_bin = /var/log/mysql/mysql-bin.log
-expire_logs_days = 10
-max_binlog_size = 100M
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-
-
-[mysqldump]
-quick
-quote-names
-max_allowed_packet = 16M
-
-[mysql]
-#no-auto-rehash # faster start of mysql but no tab completition
-
-[isamchk]
-key_buffer = 16M
-
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-# The files must end with '.cnf', otherwise they'll be ignored.
-#
-!includedir /etc/mysql/conf.d/
diff --git a/vorstandspi/mysql/handlers/main.yml b/vorstandspi/mysql/handlers/main.yml
index 3755d8ce..1ed3c427 100644
--- a/vorstandspi/mysql/handlers/main.yml
+++ b/vorstandspi/mysql/handlers/main.yml
@@ -1,3 +1,3 @@
---
-- name: restart mysql
- service: name=mysql state=restarted
+#- name: restart mysql
+# service: name=mariadb state=restarted
diff --git a/vorstandspi/mysql/tasks/main.yml b/vorstandspi/mysql/tasks/main.yml
index 0fabc491..00dbef32 100644
--- a/vorstandspi/mysql/tasks/main.yml
+++ b/vorstandspi/mysql/tasks/main.yml
@@ -1,12 +1,4 @@
---
-
-# Konfiguration übertragen
-# Muss vor installation des mysql erfolgen, da der mysql server
-# sonst nicht startet
-- name: Konfig-Datei my.cnf kopieren
- copy: src=my.cnf dest=/etc/mysql/my.cnf
- notify: restart mysql
-
# Pakete installieren
- name: mysql installieren
apt:
@@ -14,5 +6,38 @@
update_cache: yes
state: installed
with_items:
- - mysql-server
+ - mariadb-server
+ - mariadb-client
+ notify: restart mysql
+
+# Datenverzeichnis erstellen
+- file:
+ path: /srv/data/mysql
+ state: directory
+ owner: mysql
+ group: mysql
+ notify: restart mysql
+
+- stat:
+ path: /var/lib/mysql
+ register: datadir
+
+- name: stop mysql
+ service: name=mariadb state=stopped
+ when: datadir.stat.islnk is not defined or datadir.stat.islnk == False
+
+- file:
+ path: /var/lib/mysql/
+ state: absent
+ when: datadir.stat.islnk is not defined or datadir.stat.islnk == False
notify: restart mysql
+
+- file:
+ src: /srv/data/mysql
+ dest: /var/lib/mysql
+ owner: mysql
+ group: mysql
+ state: link
+ when: datadir.stat.islnk is not defined
+ notify: restart mysql
+
--
GitLab