Merge branch 'main' of git.ai.ssau.ru:myoffice/linux_tasks

module2/04_postfix_dovecot/tasks.md

@@ -195,7 +195,7 @@ openssl s_client -connect stud15.myoffice.ru:993 -showcerts | openssl x509 -text
 ```
 
 ## 5.2
-Настройте SPF сами или обратитесь к владельцу домена для внесения txt DNS записи следующего вида:
+Настройте DMARC сами или обратитесь к владельцу домена для внесения txt DNS записи следующего вида:
 ```
 Имя: _dmarc.stud15.myoffice.ru.
 Значение: v=DMARC1; p=none; aspf=r; sp=none

module2/05_sql_postgresql/scripts/weather.sql

@@ -34,7 +34,7 @@ CREATE TABLE public.weather (
     event_id integer,
     state character varying(14),
     state_fips integer,
-    "YEAR" integer,
+    year integer,
     month_name character varying(8),
     event_type character varying(24),
     cz_type character varying(1),
@@ -50,7 +50,7 @@ CREATE TABLE public.weather (
     deaths_indirect integer,
     damage_property character varying(7),
     damage_crops character varying(6),
-    "SOURCE" character varying(25),
+    source character varying(25),
     magnitude real,
     magnitude_type character varying(2),
     flood_cause character varying(22),
@@ -84,7 +84,7 @@ ALTER TABLE public.weather OWNER TO postgres;
 -- Data for Name: weather; Type: TABLE DATA; Schema: public; Owner: postgres
 --
 
-COPY public.weather (begin_yearmonth, begin_day, begin_time, end_yearmonth, end_day, end_time, episode_id, event_id, state, state_fips, "YEAR", month_name, event_type, cz_type, cz_fips, cz_name, wfo, begin_date_time, cz_timezone, end_date_time, injuries_direct, injuries_indirect, deaths_direct, deaths_indirect, damage_property, damage_crops, "SOURCE", magnitude, magnitude_type, flood_cause, category, tor_f_scale, tor_length, tor_width, tor_other_wfo, tor_other_cz_state, tor_other_cz_fips, tor_other_cz_name, begin_range, begin_azimuth, begin_location, end_range, end_azimuth, end_location, begin_lat, begin_lon, end_lat, end_lon, episode_narrative, event_narrative, data_source) FROM stdin;
+COPY public.weather (begin_yearmonth, begin_day, begin_time, end_yearmonth, end_day, end_time, episode_id, event_id, state, state_fips, year, month_name, event_type, cz_type, cz_fips, cz_name, wfo, begin_date_time, cz_timezone, end_date_time, injuries_direct, injuries_indirect, deaths_direct, deaths_indirect, damage_property, damage_crops, source, magnitude, magnitude_type, flood_cause, category, tor_f_scale, tor_length, tor_width, tor_other_wfo, tor_other_cz_state, tor_other_cz_fips, tor_other_cz_name, begin_range, begin_azimuth, begin_location, end_range, end_azimuth, end_location, begin_lat, begin_lon, end_lat, end_lon, episode_narrative, event_narrative, data_source) FROM stdin;
 201102	27	300	201102	27	1500	49358	289076	NEW HAMPSHIRE	33	2011	February	Winter Storm	Z	12	EASTERN HILLSBOROUGH	BOX	27-FEB-11 03:00:00	EST-5	27-FEB-11 15:00:00	0	0	0	0	0.00K	0.00K	Trained Spotter	\N					\N	\N			\N		\N			\N			\N	\N	\N	\N	A weak area of low pressure moved eastward out of the Great Lakes Region and off the New England shoreline gradually pushing out to sea.  Mainly advisory level snows were experienced over much of the forecast region as a very cold air mass was in place over the region with slightly drier conditions.	A total of 6 to 8 inches of snow fell across Hillsborough County.	CSV
 201101	18	630	201101	18	1630	47655	277847	NEW HAMPSHIRE	33	2011	January	Winter Storm	Z	12	EASTERN HILLSBOROUGH	BOX	18-JAN-11 06:30:00	EST-5	18-JAN-11 16:30:00	0	0	0	0	0.00K	0.00K	Amateur Radio	\N					\N	\N			\N		\N			\N			\N	\N	\N	\N	Area of low pressure developed and moved up the eastern shoreline bringing a mix of snow and ice for the New England region.	Between 6 to 8 inches of snow fell across Eastern Hillsborough County.	CSV
 201101	21	400	201101	21	1200	47661	277878	NEW HAMPSHIRE	33	2011	January	Winter Storm	Z	12	EASTERN HILLSBOROUGH	BOX	21-JAN-11 04:00:00	EST-5	21-JAN-11 12:00:00	0	0	0	0	0.00K	0.00K	Amateur Radio	\N					\N	\N			\N		\N			\N			\N	\N	\N	\N	An area of low pressure lifted northeast through the Western Atlantic and passed offshore of the Southeastern New England Shoreline. Snow accumulations on the order of 3 to 8 inches, with lighter amounts out on the Cape and Islands, were attributable with this storm. The light and fluffy nature of the snow combined with strong winds associated with the storm resulted in blowing and drifing, as well as visibility restrictions.	Between 5 to 7 inches of snow fell across Eastern Hillsborough County.	CSV